Author: asoldano
Date: Thu May 2 23:11:46 2013
New Revision: 1478600
URL: http://svn.apache.org/r1478600
Log:
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.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1478598
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.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.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1478600&r1=1478599&r2=1478600&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Thu May 2 23:11:46 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) {
