Author: rwonly
Date: Thu Oct 14 02:34:48 2010
New Revision: 1022362
URL: http://svn.apache.org/viewvc?rev=1022362&view=rev
Log:
GERONIMO-5401 Geronimo encrypts empty passwords
Modified:
geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
Modified: geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java?rev=1022362&r1=1022361&r2=1022362&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
(original)
+++ geronimo/server/branches/2.2/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/annotation/EncryptionSetting.java
Thu Oct 14 02:34:48 2010
@@ -25,6 +25,7 @@ public enum EncryptionSetting {
ENCRYPTED {
public Object encrypt(Object plaintext) {
if (plaintext == null) return null;
+ if (plaintext.equals("")) return "";
return EncryptionManager.encrypt((String)plaintext);
}
public Object decrypt(Object encrypted) {
|