geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r813259 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Date Thu, 10 Sep 2009 06:49:22 GMT
Author: genspring
Date: Thu Sep 10 06:49:21 2009
New Revision: 813259

URL: http://svn.apache.org/viewvc?rev=813259&view=rev
Log:
GERONIMO-4858 Geronimo 2.2 doesn't add correct connector attributes to server.xml, patch from
Siqi.

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=813259&r1=813258&r2=813259&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Thu Sep 10 06:49:21 2009
@@ -634,7 +634,7 @@
                       continue;
                }
 
-            } else if(defaultAttribute.getValue().equals(latestAttibuteValue)){
+            } else if(defaultAttribute.getValue()!=null&&defaultAttribute.getValue().equals(latestAttibuteValue)){
                
                 if (defaultAttributeNames.contains(attributeName)) {
 
@@ -647,7 +647,9 @@
                
             } else {
                 //adding changed attributes to attributesToUpdate map.
-                attributesToUpdate.put(attributeName, defaultAttribute.getStringValue());
 
+                ConnectorAttribute latestAttibute = new ConnectorAttribute(defaultAttribute);
+                latestAttibute.setValue(latestAttibuteValue);
+                attributesToUpdate.put(attributeName, latestAttibute.getStringValue()); 

             }
         }
         



Mime
View raw message