svn commit: r1489942 - /cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

[ay]

Author: ay
Date: Wed Jun  5 16:14:06 2013
New Revision: 1489942

URL: http://svn.apache.org/r1489942
Log:
[CXF-5057] NPE at the decoupled endpoint when receving a response messge with 
unknown identifier

Modified:
    
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

Modified: 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1489942&r1=1489941&r2=1489942&view=diff
==============================================================================
--- 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
 (original)
+++ 
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
 Wed Jun  5 16:14:06 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");