geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ashishj...@apache.org
Subject svn commit: r961301 - in /geronimo/server/branches/2.1/plugins: console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
Date Wed, 07 Jul 2010 08:28:05 GMT
Author: ashishjain
Date: Wed Jul  7 08:28:05 2010
New Revision: 961301

URL: http://svn.apache.org/viewvc?rev=961301&view=rev
Log:
GERONIMO-5431 Modified the Connector portlet to persist changes for null values to parameters

Modified:
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=961301&r1=961300&r2=961301&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
(original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Wed Jul  7 08:28:05 2010
@@ -179,9 +179,9 @@ public class ConnectorPortlet extends Ba
                     // set the string form of the attribute's value as submitted by the browser
                     if (value == null || value.trim().length()<1) {
                         // special case for KeystoreManager gbean
-                        if ("trustStore".equals(attribute.getAttributeName())) {
+                       // if ("trustStore".equals(attribute.getAttributeName())) {
                             setProperty(connector,name,null);
-                        }
+                        //}
                     } else {
                         // set the string value on the ConnectorAttribute so 
                         // it can handle type conversion via getValue()

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java?rev=961301&r1=961300&r2=961301&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
(original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
Wed Jul  7 08:28:05 2010
@@ -158,7 +158,10 @@ public abstract class AbstractHttp11Conn
     public void setTruststorePass(String truststorePass) {
         if (truststorePass!= null && truststorePass.equals("")) 
             truststorePass = null;
-        connector.setAttribute("truststorePass", truststorePass);
+        if(truststorePass==null)
+            connector.setAttribute("truststorePass", "");
+        else
+            connector.setAttribute("truststorePass", truststorePass);
     }
 
     public void setTruststoreType(String truststoreType) {



Mime
View raw message