You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/10/21 15:32:57 UTC
svn commit: r1534147 - in
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security:
policy/interceptors/SecureConversationOutInterceptor.java
wss4j/policyhandlers/StaxTransportBindingHandler.java
Author: coheigea
Date: Mon Oct 21 13:32:57 2013
New Revision: 1534147
URL: http://svn.apache.org/r1534147
Log:
Some fixes to the last commit
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java?rev=1534147&r1=1534146&r2=1534147&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationOutInterceptor.java Mon Oct 21 13:32:57 2013
@@ -86,7 +86,8 @@ class SecureConversationOutInterceptor e
//server side should be checked on the way in
for (AssertionInfo ai : ais) {
ai.setAsserted(true);
- }
+ }
+ NegotiationUtils.assertPolicy(aim, SPConstants.BOOTSTRAP_POLICY);
}
}
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java?rev=1534147&r1=1534146&r2=1534147&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxTransportBindingHandler.java Mon Oct 21 13:32:57 2013
@@ -110,9 +110,11 @@ public class StaxTransportBindingHandler
}
configureLayout(aim);
- assertAlgorithmSuite(tbinding.getAlgorithmSuite());
- assertWSSProperties(tbinding.getName().getNamespaceURI());
- assertTrustProperties(tbinding.getName().getNamespaceURI());
+ if (tbinding != null) {
+ assertAlgorithmSuite(tbinding.getAlgorithmSuite());
+ assertWSSProperties(tbinding.getName().getNamespaceURI());
+ assertTrustProperties(tbinding.getName().getNamespaceURI());
+ }
}
/**