svn commit: r1034062 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java

[dkulp]

Author: dkulp
Date: Thu Nov 11 19:31:29 2010
New Revision: 1034062

URL: http://svn.apache.org/viewvc?rev=1034062&view=rev
Log:
[CXF-3116] Add an NPE guard

Modified:
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java

Modified: 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java?rev=1034062&r1=1034061&r2=1034062&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/HolderInInterceptor.java
 Thu Nov 11 19:31:29 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;
         }