You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/09/19 15:35:55 UTC

svn commit: r1172621 - /geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java

Author: xuhaihong
Date: Mon Sep 19 13:35:54 2011
New Revision: 1172621

URL: http://svn.apache.org/viewvc?rev=1172621&view=rev
Log:
GERONIMO-5432 Minor correction for my last commit

Modified:
    geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java

Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=1172621&r1=1172620&r2=1172621&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java Mon Sep 19 13:35:54 2011
@@ -624,7 +624,7 @@ public class ConnectorType {
                 TomcatServerGBean.ConnectorName.put(connector, value);                
             } else{
                 if ("keystorePass".equals(name)) {
-                    value = (String) EncryptionManager.decrypt(name);
+                    value = (String) EncryptionManager.decrypt(value);
                 }
                 connector.setProperty(name, value);
             }