geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1172619 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
Date Mon, 19 Sep 2011 13:34:28 GMT
Author: xuhaihong
Date: Mon Sep 19 13:34:28 2011
New Revision: 1172619

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

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=1172619&r1=1172618&r2=1172619&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
Mon Sep 19 13:34:28 2011
@@ -621,10 +621,10 @@ public class ConnectorType {
 
             } else if ("name".equals(name)) {
                 //name attribute is held by Geronimo to identify the connector, it is not
required by Tomcat
-                TomcatServerGBean.ConnectorName.put(connector, entry.getValue());
+                TomcatServerGBean.ConnectorName.put(connector, value);
             } else {
                 if ("keystorePass".equals(name)) {
-                    value = (String) EncryptionManager.decrypt(name);
+                    value = (String) EncryptionManager.decrypt(value);
                 }
                 connector.setProperty(name, value);
             }



Mime
View raw message