cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1294834 - /cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Date Tue, 28 Feb 2012 21:11:07 GMT
Author: dkulp
Date: Tue Feb 28 21:11:07 2012
New Revision: 1294834

URL: http://svn.apache.org/viewvc?rev=1294834&view=rev
Log:
Merged revisions 1294827 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1294827 | dkulp | 2012-02-28 15:53:41 -0500 (Tue, 28 Feb 2012) | 2 lines

  Avoid an NPE

........

Modified:
    cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1294834&r1=1294833&r2=1294834&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Tue Feb 28 21:11:07 2012
@@ -623,7 +623,8 @@ public class MAPAggregator extends Abstr
                                                           Names.HEADER_REQUIRED_NAME));
                 }
             }
-            if (MessageUtils.isPartialResponse(message)) {
+            if (MessageUtils.isPartialResponse(message) 
+                && message.getExchange().getOutMessage() != null) {
                 // marked as a partial response, let's see if it really is
                 MessageInfo min = message.get(MessageInfo.class);
                 MessageInfo mout = message.getExchange().getOutMessage().get(MessageInfo.class);



Mime
View raw message