You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/04/29 15:00:43 UTC

cxf git commit: [CXF-6274] NullPointerException in DestinationSequence because of RMCaptureInInterceptor not inserted

Repository: cxf
Updated Branches:
  refs/heads/master 94a89c7dd -> ac133b9f0


[CXF-6274] NullPointerException in DestinationSequence because of RMCaptureInInterceptor not inserted


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ac133b9f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ac133b9f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ac133b9f

Branch: refs/heads/master
Commit: ac133b9f0feccc120cdf70ebbd68e1752f2372ad
Parents: 94a89c7
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Wed Apr 29 14:59:34 2015 +0200
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Wed Apr 29 15:00:32 2015 +0200

----------------------------------------------------------------------
 .../apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java  | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ac133b9f/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
index 45e0a0a..7830065 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyInterceptorProvider.java
@@ -27,9 +27,11 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
 import org.apache.cxf.ws.rm.RM10Constants;
 import org.apache.cxf.ws.rm.RM11Constants;
+import org.apache.cxf.ws.rm.RMCaptureInInterceptor;
 import org.apache.cxf.ws.rm.RMCaptureOutInterceptor;
 import org.apache.cxf.ws.rm.RMDeliveryInterceptor;
 import org.apache.cxf.ws.rm.RMInInterceptor;
+import org.apache.cxf.ws.rm.RMManager;
 import org.apache.cxf.ws.rm.RMOutInterceptor;
 import org.apache.cxf.ws.rm.soap.RMSoapInInterceptor;
 import org.apache.cxf.ws.rm.soap.RMSoapOutInterceptor;
@@ -40,6 +42,7 @@ public class RMPolicyInterceptorProvider extends AbstractPolicyInterceptorProvid
     private static final Collection<QName> ASSERTION_TYPES;
     private RMInInterceptor rmIn = new RMInInterceptor();
     private RMOutInterceptor rmOut = new RMOutInterceptor();
+    private RMCaptureInInterceptor rmCaptureIn = new RMCaptureInInterceptor();
     private RMCaptureOutInterceptor rmCaptureOut = new RMCaptureOutInterceptor();
     private RMSoapOutInterceptor rmOutSoap = new RMSoapOutInterceptor();
     private RMSoapInInterceptor rmInSoap = new RMSoapInInterceptor();
@@ -64,6 +67,10 @@ public class RMPolicyInterceptorProvider extends AbstractPolicyInterceptorProvid
         getInInterceptors().add(rmIn);
         getInInterceptors().add(rmInSoap);
         getInInterceptors().add(rmDelivery);
+        RMManager manager = bus.getExtension(RMManager.class);
+        if (null != manager && null != manager.getStore()) {
+            getInInterceptors().add(rmCaptureIn);
+        }
 
         getOutInterceptors().add(rmOut);
         getOutInterceptors().add(rmCaptureOut);