fixed buildExceptionMessage to avoid potential NPE (SPR-5275)

16 years ago · 3d1a709a5e
parent 0038aaa697
commit 3d1a709a5e
1 changed files with 7 additions and 2 deletions
--- a/org.springframework.jms/src/main/java/org/springframework/jms/support/JmsUtils.java
+++ b/org.springframework.jms/src/main/java/org/springframework/jms/support/JmsUtils.java
@ -252,8 +252,13 @@ public abstract class JmsUtils {
 	public static String buildExceptionMessage(JMSException ex) {
 		String message = ex.getMessage();
 		Exception linkedEx = ex.getLinkedException();
-		if (linkedEx != null && message.indexOf(linkedEx.getMessage()) == -1) {
-			message = message + "; nested exception is " + linkedEx;
+		if (linkedEx != null) {
+			if (message == null) {
+				message = linkedEx.toString();
+			}
+			else if (!message.contains(linkedEx.getMessage())) {
+				message = message + "; nested exception is " + linkedEx;
+			}
 		}
 		return message;
 	}