Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E9A74200C30 for ; Mon, 20 Feb 2017 17:54:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E82BE160B58; Mon, 20 Feb 2017 16:54:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3F687160B73 for ; Mon, 20 Feb 2017 17:54:01 +0100 (CET) Received: (qmail 3273 invoked by uid 500); 20 Feb 2017 16:53:55 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 3155 invoked by uid 99); 20 Feb 2017 16:53:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Feb 2017 16:53:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3ADC1E0206; Mon, 20 Feb 2017 16:53:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 20 Feb 2017 16:53:57 -0000 Message-Id: In-Reply-To: <1f97fd2a258c4275a44898dcd1971434@git.apache.org> References: <1f97fd2a258c4275a44898dcd1971434@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing backmerge archived-at: Mon, 20 Feb 2017 16:54:02 -0000 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 Authored: Mon Feb 20 16:53:45 2017 +0000 Committer: Colm O hEigeartaigh 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);