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

Improve InvocableHandlerMethod error handling 

This commit improves the fix for gh-18491 for Java 18 as in this case
the exception message might not be null.
This commit is contained in:
Brian Clozel 2022-09-09 20:20:29 +02:00
parent 1dc3d5d2d6
commit 1051fe7bee
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -170,7 +170,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
assertTargetBean(getBridgedMethod(), getBean(), args); assertTargetBean(getBridgedMethod(), getBean(), args);
String text = (ex.getMessage() != null ? ex.getMessage() : "Illegal argument"); String text = (ex.getMessage() == null || ex.getCause() instanceof NullPointerException)
? "Illegal argument": ex.getMessage();
throw new IllegalStateException(formatInvokeError(text, args), ex); throw new IllegalStateException(formatInvokeError(text, args), ex);
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {

3
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
View File

@ -206,7 +206,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
assertTargetBean(method, getBean(), args); assertTargetBean(method, getBean(), args);
String text = (ex.getMessage() != null ? ex.getMessage() : "Illegal argument"); String text = (ex.getMessage() == null || ex.getCause() instanceof NullPointerException)
? "Illegal argument": ex.getMessage();
throw new IllegalStateException(formatInvokeError(text, args), ex); throw new IllegalStateException(formatInvokeError(text, args), ex);
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {