geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashishj...@apache.org
Subject svn commit: r957469 - /geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java
Date Thu, 24 Jun 2010 09:29:20 GMT
Author: ashishjain
Date: Thu Jun 24 09:29:19 2010
New Revision: 957469

URL: http://svn.apache.org/viewvc?rev=957469&view=rev
Log:
GERONIMO-5401 Modify the logic for strings to be encrypted

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java?rev=957469&r1=957468&r2=957469&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanData.java
Thu Jun 24 09:29:19 2010
@@ -222,7 +222,7 @@ public class GBeanData implements Extern
         for (Map.Entry<String, Object> entry : attributes.entrySet()) {
             String name = entry.getKey();
             Object value = entry.getValue();
-            if (isEncrypted(name) && value != null) {
+            if (isEncrypted(name) && value != null && !(value.equals("")))
{
                 value = EncryptionManager.encrypt((String) value);
             }
             try {



Mime
View raw message