You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/15 20:49:34 UTC
svn commit: r1503402 -
/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Author: dkulp
Date: Mon Jul 15 18:49:33 2013
New Revision: 1503402
URL: http://svn.apache.org/r1503402
Log:
Merged revisions 1478601 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1478601 | asoldano | 2013-05-02 19:17:13 -0400 (Thu, 02 May 2013) | 16 lines
Merged revisions 1478600 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1478600 | asoldano | 2013-05-03 01:11:46 +0200 (Fri, 03 May 2013) | 9 lines
Merged revisions 1478598 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1478598 | asoldano | 2013-05-03 01:07:20 +0200 (Fri, 03 May 2013) | 2 lines
[CXF-4997] Skip PolicyBasedWSS4JInInterceptor processing when AssertionInfoMap not available
........
................
........
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1503402&r1=1503401&r2=1503402&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Mon Jul 15 18:49:33 2013
@@ -51,6 +51,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.MapNamespaceContext;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.ws.policy.AssertionInfo;
@@ -113,6 +114,13 @@ public class PolicyBasedWSS4JInIntercept
super(true);
}
+ public void handleMessage(SoapMessage msg) throws Fault {
+ AssertionInfoMap aim = msg.get(AssertionInfoMap.class);
+ if (aim != null) {
+ super.handleMessage(msg);
+ }
+ }
+
private static Properties getProps(Object o, URL propsURL, SoapMessage message) {
Properties properties = null;
if (o instanceof Properties) {