svn commit: r1489943 - in /cxf/branches/2.7.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

[ay]

Author: ay
Date: Wed Jun  5 16:16:58 2013
New Revision: 1489943

URL: http://svn.apache.org/r1489943
Log:
Merged revisions 1489942 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1489942 | ay | 2013-06-05 18:14:06 +0200 (Wed, 05 Jun 2013) | 1 line
  
  [CXF-5057] NPE at the decoupled endpoint when receving a response messge with 
unknown identifier
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

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

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1489943&r1=1489942&r2=1489943&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
 Wed Jun  5 16:16:58 2013
@@ -826,8 +826,9 @@ public class MAPCodec extends AbstractSo
                                           
"org.apache.cxf.ws.addressing.MAPAggregator.addressingDisabled",
                                           false)) {
                     //see if it can directly be correlated with the out 
message:
-                    AddressingProperties outp = 
ContextUtils.retrieveMAPs(message.getExchange().getOutMessage(),
-                                                                          
false, true, false);
+                    Message outmsg = message.getExchange().getOutMessage();
+                    AddressingProperties outp = outmsg != null 
+                        ? ContextUtils.retrieveMAPs(outmsg, false, true, 
false) : null;
                     if (outp == null 
                         || 
!outp.getMessageID().getValue().equals(maps.getRelatesTo().getValue())) {
                         LOG.log(Level.WARNING, "CORRELATION_FAILURE_MSG");