cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing backmerge
Date Mon, 20 Feb 2017 16:53:57 GMT
Fixing backmerge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2bad7f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2bad7f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2bad7f9

Branch: refs/heads/3.1.x-fixes
Commit: b2bad7f9eba17cac427edbab18b4b6f9c8ef7556
Parents: 07fc13e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Feb 20 16:53:45 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Feb 20 16:53:45 2017 +0000

----------------------------------------------------------------------
 .../security/wss4j/policyhandlers/AbstractBindingBuilder.java  | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b2bad7f9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
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 2b53c20..499583e 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
@@ -803,13 +803,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
                 if (StringUtils.isEmpty(password)) {
                     password = getPassword(userName, token, WSPasswordCallback.USERNAME_TOKEN);
                 }
-<<<<<<< HEAD
-            
-                if (!StringUtils.isEmpty(password)) {
-=======
-
                 if (password != null) {
->>>>>>> f91541b... CXF-7255 - Allow empty ("") passwords when calling
a service
                     // If the password is available then build the token
                     if (token.getPasswordType() == UsernameToken.PasswordType.HashPassword)
{
                         utBuilder.setPasswordType(WSConstants.PASSWORD_DIGEST);


Mime
View raw message