cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r953800 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Date Fri, 11 Jun 2010 18:01:28 GMT
Author: dkulp
Date: Fri Jun 11 18:01:28 2010
New Revision: 953800

URL: http://svn.apache.org/viewvc?rev=953800&view=rev
Log:
Merged revisions 951549 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r951549 | dkulp | 2010-06-04 16:12:23 -0400 (Fri, 04 Jun 2010) | 1 line
  
  Add some NPE guards
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=953800&r1=953799&r2=953800&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Fri Jun 11 18:01:28 2010
@@ -226,6 +226,11 @@ public class JMSDestination extends Abst
             // handle the incoming message
             incomingObserver.onMessage(inMessage);
             
+            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)
{



Mime
View raw message