This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new 4eb7d68 Fixing merge
4eb7d68 is described below
commit 4eb7d68f8d3628bb3110760cf2c9221dfd98534f
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Mon Oct 23 15:49:51 2017 +0100
Fixing merge
---
.../cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index e8312d2..313f8cf 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1406,9 +1406,9 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
if (!found.contains(el)) {
found.add(el);
WSEncryptionPart part = null;
- boolean saml1 =
WSS4JConstants.SAML_NS.equals(el.getNamespaceURI())
+ boolean saml1 =
WSConstants.SAML_NS.equals(el.getNamespaceURI())
&& "Assertion".equals(el.getLocalName());
- boolean saml2 =
WSS4JConstants.SAML2_NS.equals(el.getNamespaceURI())
+ boolean saml2 =
WSConstants.SAML2_NS.equals(el.getNamespaceURI())
&& "Assertion".equals(el.getLocalName());
if (useSTRTransform && (saml1 || saml2)) {
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
