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

Ignore null message when introspecting resource cleanup failure 

This commit fixes a regression introduced in conjunction with gh-27572.

See gh-30597
Closes gh-30729
This commit is contained in:
Sam Brannen 2023-06-23 12:01:16 +02:00
parent 29248dff15
commit 9ccbeec947
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperatorImpl.java
View File

@ -112,11 +112,12 @@ final class TransactionalOperatorImpl implements TransactionalOperator {
* @param ex the throwable to try to unwrap * @param ex the throwable to try to unwrap
*/ */
private Throwable unwrapIfResourceCleanupFailure(Throwable ex) { private Throwable unwrapIfResourceCleanupFailure(Throwable ex) {
if (ex instanceof RuntimeException && if (ex instanceof RuntimeException && ex.getCause() != null) {
ex.getCause() != null && String msg = ex.getMessage();
ex.getMessage().startsWith("Async resource cleanup failed")) { if (msg != null && msg.startsWith("Async resource cleanup failed")) {
return ex.getCause(); return ex.getCause();
} }
}
return ex; return ex;
} }