springframework-cvs

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/jms/support
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25367/src/org/springframework/jms/support

Modified Files:
	JmsUtils.java 
Log Message:
fixed buildExceptionMessage to avoid potential NPE (SPR-5275)

Index: JmsUtils.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/jms/support/JmsUtils.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JmsUtils.java	17 Jul 2008 07:46:27 -0000	1.21
--- JmsUtils.java	20 Nov 2008 22:17:59 -0000	1.22
***************
*** 253,258 ****
  		String message = ex.getMessage();
  		Exception linkedEx = ex.getLinkedException();
! 		if (linkedEx != null && message.indexOf(linkedEx.getMessage()) == -1) {
! 			message = message + "; nested exception is " + linkedEx;
  		}
  		return message;
--- 253,263 ----
  		String message = ex.getMessage();
  		Exception linkedEx = ex.getLinkedException();
! 		if (linkedEx != null) {
! 			if (message == null) {
! 				message = linkedEx.toString();
! 			}
! 			else if (!message.contains(linkedEx.getMessage())) {
! 				message = message + "; nested exception is " + linkedEx;
! 			}
  		}
  		return message;