Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BC6139A85 for ; Fri, 2 Mar 2012 16:35:06 +0000 (UTC) Received: (qmail 32086 invoked by uid 500); 2 Mar 2012 16:35:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 32033 invoked by uid 500); 2 Mar 2012 16:35:06 -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 32026 invoked by uid 99); 2 Mar 2012 16:35:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 16:35:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 16:35:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7F64F23888E7; Fri, 2 Mar 2012 16:34:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296295 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Date: Fri, 02 Mar 2012 16:34:45 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302163445.7F64F23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Mar 2 16:34:44 2012 New Revision: 1296295 URL: http://svn.apache.org/viewvc?rev=1296295&view=rev Log: Do not set passwords to the empty String if they are null. - This is causing the keystore.private.password property of WSS4J to not work Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1296295&r1=1296294&r2=1296295&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Mar 2 16:34:44 2012 @@ -532,9 +532,6 @@ public abstract class AbstractBindingBui } String password = getPassword(uname, token, WSPasswordCallback.SIGNATURE); - if (password == null) { - password = ""; - } sig.setUserInfo(uname, password); try { sig.prepare(saaj.getSOAPPart(), secToken.getCrypto(), secHeader); @@ -936,9 +933,6 @@ public abstract class AbstractBindingBui } String password = getPassword(user, token, WSPasswordCallback.SIGNATURE); - if (password == null) { - password = ""; - } // TODO configure using a KeyValue here assertion.signAssertion(user, password, crypto, false); @@ -1744,9 +1738,6 @@ public abstract class AbstractBindingBui } String password = getPassword(user, token, WSPasswordCallback.SIGNATURE); - if (password == null) { - password = ""; - } sig.setUserInfo(user, password); sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getAsymmetricSignature()); sig.setDigestAlgo(binding.getAlgorithmSuite().getDigest());