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 2012/03/02 17:32:18 UTC
svn commit: r1296291 -
/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Author: coheigea
Date: Fri Mar 2 16:32:17 2012
New Revision: 1296291
URL: http://svn.apache.org/viewvc?rev=1296291&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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Modified: cxf/branches/2.5.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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1296291&r1=1296290&r2=1296291&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Fri Mar 2 16:32:17 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());