Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Simon Baslé
2023-05-10 15:18:57 +02:00
parent 96fbcb26c9 c733ae0f22
commit dbc42f56b3
2 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
View File

@@ -173,12 +173,12 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe
}
if (PayloadApplicationEvent.class.isAssignableFrom(eventType.toClass())) {
ResolvableType payloadType = eventType.as(PayloadApplicationEvent.class).getGeneric();
if (declaredEventType.isAssignableFrom(payloadType)) {
if (declaredEventType.isAssignableFrom(payloadType) || eventType.hasUnresolvableGenerics()) {
return true;
}
}
}
return eventType.hasUnresolvableGenerics();
return false;
}
@Override