Author: dkulp Date: Wed Feb 29 02:55:13 2012 New Revision: 1294952 URL: http://svn.apache.org/viewvc?rev=1294952&view=rev Log: Merged revisions 1294834 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1294834 | dkulp | 2012-02-28 16:11:07 -0500 (Tue, 28 Feb 2012) | 9 lines 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.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1294952&r1=1294951&r2=1294952&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Wed Feb 29 02:55:13 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);
