tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r529095 - in /tomcat/container/tc5.5.x: modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java webapps/docs/changelog.xml
Date Sun, 15 Apr 2007 23:38:22 GMT
Author: markt
Date: Sun Apr 15 16:38:21 2007
New Revision: 529095

URL: http://svn.apache.org/viewvc?view=rev&rev=529095
Log:
Fix bug 41956. Persist the connector's address attribute when committing changes.

Modified:
    tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?view=diff&rev=529095&r1=529094&r2=529095
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Sun Apr 15 16:38:21 2007
@@ -23,6 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -102,6 +103,10 @@
             }
             if (value == null) {
                 continue; // Null values are not persisted
+            }
+            // Convert IP addresses to strings so they will be persisted
+            if (value instanceof InetAddress) {
+                value = ((InetAddress) value).getHostAddress();
             }
             if (!isPersistable(value.getClass())) {
                 continue;

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=529095&r1=529094&r2=529095
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Apr 15 16:38:21 2007
@@ -84,6 +84,10 @@
         <bug>42025</bug>: Update valve documentation to refer to correct regular
         expression implementation. (markt)
       </fix>
+      <fix>
+        <bug>41956</bug>: Don't skip the connector address attribute when
+        persisting server.xml changes via the admin webapp. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message