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

2015-04-29 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 83a6f123a - 6a2b55597


[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/6a2b5559
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6a2b5559
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6a2b5559

Branch: refs/heads/3.0.x-fixes
Commit: 6a2b5559768de9cf4f5eda3f31fb948d360bdd92
Parents: 83a6f12
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Apr 29 14:59:34 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Apr 29 15:02:21 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/6a2b5559/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 CollectionQName 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);

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

2015-04-29 Thread ay 
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 a...@apache.org
Authored: Wed Apr 29 14:59:34 2015 +0200
Committer: Akitoshi Yoshida a...@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 CollectionQName 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);

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

2015-04-29 Thread ay 
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes c824bd844 - bee6fdb5d


[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/bee6fdb5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bee6fdb5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bee6fdb5

Branch: refs/heads/2.7.x-fixes
Commit: bee6fdb5d76ff029914cd3506e0cfa296f5ee93d
Parents: c824bd8
Author: Akitoshi Yoshida a...@apache.org
Authored: Wed Apr 29 14:59:34 2015 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Wed Apr 29 15:18:42 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/bee6fdb5/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 30911b8..ea7ee1c 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
@@ -25,8 +25,10 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.ws.policy.AbstractPolicyInterceptorProvider;
+import org.apache.cxf.ws.rm.RMCaptureInInterceptor;
 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.RMSoapInterceptor;
 
@@ -37,6 +39,7 @@ public class RMPolicyInterceptorProvider extends 
AbstractPolicyInterceptorProvid
 private RMInInterceptor rmIn = new RMInInterceptor();
 private RMOutInterceptor rmOut = new RMOutInterceptor();
 private RMSoapInterceptor rmSoap = new RMSoapInterceptor();
+private RMCaptureInInterceptor rmCaptureIn = new RMCaptureInInterceptor();
 private RMDeliveryInterceptor rmDelivery = new RMDeliveryInterceptor();
 
 static {
@@ -55,6 +58,10 @@ public class RMPolicyInterceptorProvider extends 
AbstractPolicyInterceptorProvid
 getInInterceptors().add(rmIn);
 getInInterceptors().add(rmSoap);
 getInInterceptors().add(rmDelivery);
+RMManager manager = bus.getExtension(RMManager.class);
+if (null != manager  null != manager.getStore()) {
+getInInterceptors().add(rmCaptureIn);
+}
 
 getOutInterceptors().add(rmOut);
 getOutInterceptors().add(rmSoap);