root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Properly identify event-related ClassCastExceptions on JDK 11 

Issue: SPR-17093
This commit is contained in:
Juergen Hoeller 2018-07-26 14:41:53 +02:00
parent 142530874b
commit e458777925
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
View File

@ -173,7 +173,7 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM
} }
catch (ClassCastException ex) { catch (ClassCastException ex) {
String msg = ex.getMessage(); String msg = ex.getMessage();
if (msg == null || matchesClassCastMessage(msg, event.getClass().getName())) { if (msg == null || matchesClassCastMessage(msg, event.getClass())) {
// Possibly a lambda-defined listener which we could not resolve the generic event type for // Possibly a lambda-defined listener which we could not resolve the generic event type for
// -> let's suppress the exception and just log a debug message. // -> let's suppress the exception and just log a debug message.
Log logger = LogFactory.getLog(getClass()); Log logger = LogFactory.getLog(getClass());
@ -187,14 +187,18 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM
} }
} }
private boolean matchesClassCastMessage(String classCastMessage, String eventClassName) { private boolean matchesClassCastMessage(String classCastMessage, Class<?> eventClass) {
// On Java 8, the message simply starts with the class name: "java.lang.String cannot be cast..." // On Java 8, the message starts with the class name: "java.lang.String cannot be cast..."
if (classCastMessage.startsWith(eventClassName)) { if (classCastMessage.startsWith(eventClass.getName())) {
return true; return true;
} }
// On Java 9, the message contains the module name: "java.base/java.lang.String cannot be cast..." // On Java 11, the message starts with "class ..." a.k.a. Class.toString()
if (classCastMessage.startsWith(eventClass.toString())) {
return true;
}
// On Java 9, the message used to contain the module name: "java.base/java.lang.String cannot be cast..."
int moduleSeparatorIndex = classCastMessage.indexOf('/'); int moduleSeparatorIndex = classCastMessage.indexOf('/');
if (moduleSeparatorIndex != -1 && classCastMessage.startsWith(eventClassName, moduleSeparatorIndex + 1)) { if (moduleSeparatorIndex != -1 && classCastMessage.startsWith(eventClass.getName(), moduleSeparatorIndex + 1)) {
return true; return true;
} }
// Assuming an unrelated class cast failure... // Assuming an unrelated class cast failure...