Author: dkulp Date: Thu Nov 11 21:12:10 2010 New Revision: 1034133 URL: http://svn.apache.org/viewvc?rev=1034133&view=rev Log: Merged revisions 1034107 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1034107 | dkulp | 2010-11-11 15:40:24 -0500 (Thu, 11 Nov 2010) | 9 lines Merged revisions 1034062 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1034062 | dkulp | 2010-11-11 14:31:29 -0500 (Thu, 11 Nov 2010) | 1 line [CXF-3116] Add an NPE guard ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java?rev=1034133&r1=1034132&r2=1034133&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java Thu Nov 11 21:12:10 2010 @@ -30,6 +30,7 @@ import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; +import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.MessagePartInfo; import org.apache.cxf.service.model.OperationInfo; @@ -46,8 +47,11 @@ public class HolderInInterceptor extends MessageContentsList inObjects = MessageContentsList.getContentsList(message); Exchange exchange = message.getExchange(); - - OperationInfo op = exchange.getBindingOperationInfo().getOperationInfo(); + BindingOperationInfo bop = exchange.getBindingOperationInfo(); + if (bop == null) { + return; + } + OperationInfo op = bop.getOperationInfo(); if (op == null || !op.hasOutput() || op.getOutput().size() == 0) { return; }
