svn commit: r1487924 - /webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java

[coheigea]

Author: coheigea
Date: Thu May 30 16:45:04 2013
New Revision: 1487924

URL: http://svn.apache.org/r1487924
Log:
Fixing error in Merlin

Modified:
    
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java

Modified: 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1487924&r1=1487923&r2=1487924&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
 Thu May 30 16:45:04 2013
@@ -683,7 +683,10 @@ public class Merlin extends CryptoBase {
             }
             String password = getPassword(identifier, callbackHandler);
             if (password == null && privatePasswordSet) {
-                password = properties.getProperty(KEYSTORE_PRIVATE_PASSWORD);
+                password = properties.getProperty(PREFIX + 
KEYSTORE_PRIVATE_PASSWORD);
+                if (password == null) {
+                    password = properties.getProperty(OLD_PREFIX + 
KEYSTORE_PRIVATE_PASSWORD);
+                }
                 if (password != null) {
                     password = password.trim();
                 }
@@ -734,7 +737,10 @@ public class Merlin extends CryptoBase {
                 throw new 
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty", msg);
             }
             if (password == null && privatePasswordSet) {
-                password = properties.getProperty(KEYSTORE_PRIVATE_PASSWORD);
+                password = properties.getProperty(PREFIX + 
KEYSTORE_PRIVATE_PASSWORD);
+                if (password == null) {
+                    password = properties.getProperty(OLD_PREFIX + 
KEYSTORE_PRIVATE_PASSWORD);
+                }
                 if (password != null) {
                     password = password.trim();
                 }