Author: dkulp
Date: Fri Jun 4 20:12:23 2010
New Revision: 951549
URL: http://svn.apache.org/viewvc?rev=951549&view=rev
Log:
Add some NPE guards
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=951549&r1=951548&r2=951549&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Fri Jun 4 20:12:23 2010
@@ -218,8 +218,10 @@ public class JMSDestination extends Abst
// handle the incoming message
incomingObserver.onMessage(inMessage);
- inMessage = inMessage.getExchange().getInMessage();
-
+ if (inMessage.getExchange() != null
+ && inMessage.getExchange().getInMessage() != null) {
+ inMessage = inMessage.getExchange().getInMessage();
+ }
//need to propagate any exceptions back to Spring container
//so transactions can occur
if (inMessage.getContent(Exception.class) != null && session !=
null) {
