From 3d1a709a5e1b0ddb7f2b0d94e0944acc5ccb870c Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 20 Nov 2008 22:18:21 +0000
Subject: [PATCH] fixed buildExceptionMessage to avoid potential NPE (SPR-5275)

---
 .../java/org/springframework/jms/support/JmsUtils.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 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
index 0f526b6aca..09cfd184de 100644
--- 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;
 	}