Skip to content

Commit 3d1a709

Browse files
committed
fixed buildExceptionMessage to avoid potential NPE (SPR-5275)
1 parent 0038aaa commit 3d1a709

File tree

1 file changed

+7
-2
lines changed
  • org.springframework.jms/src/main/java/org/springframework/jms/support

1 file changed

+7
-2
lines changed

org.springframework.jms/src/main/java/org/springframework/jms/support/JmsUtils.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,13 @@ public static void rollbackIfNecessary(Session session) throws JMSException {
252252
public static String buildExceptionMessage(JMSException ex) {
253253
String message = ex.getMessage();
254254
Exception linkedEx = ex.getLinkedException();
255-
if (linkedEx != null && message.indexOf(linkedEx.getMessage()) == -1) {
256-
message = message + "; nested exception is " + linkedEx;
255+
if (linkedEx != null) {
256+
if (message == null) {
257+
message = linkedEx.toString();
258+
}
259+
else if (!message.contains(linkedEx.getMessage())) {
260+
message = message + "; nested exception is " + linkedEx;
261+
}
257262
}
258263
return message;
259264
}

0 commit comments

Comments
 (0)