Author: jfclere
Date: Tue Aug 27 16:12:15 2013
New Revision: 1517865
URL: http://svn.apache.org/r1517865
Log:
Make sure that "null" doesn't get insert in server.xml.
Modified:
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
Modified:
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1517865&r1=1517864&r2=1517865&view=diff
==============================================================================
---
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
(original)
+++
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
Tue Aug 27 16:12:15 2013
@@ -103,6 +103,9 @@ public class ConnectorStoreAppender exte
if (value == null) {
continue; // Null values are not persisted
}
+ if (value.equals("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();
@@ -295,4 +298,4 @@ public class ConnectorStoreAppender exte
return (jkHomeBase);
}
-}
\ No newline at end of file
+}
Modified:
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java?rev=1517865&r1=1517864&r2=1517865&view=diff
==============================================================================
---
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
(original)
+++
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
Tue Aug 27 16:12:15 2013
@@ -78,6 +78,9 @@ public class IDynamicPropertyStoreAppend
if (value == null) {
continue; // Null values are not persisted
}
+ if (value.equals("null")) {
+ continue; // "null" values are not persisted
+ }
if (!isPersistable(value.getClass())) {
continue;
}
@@ -131,4 +134,4 @@ public class IDynamicPropertyStoreAppend
return propertyKeys;
}
-}
\ No newline at end of file
+}
Modified:
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1517865&r1=1517864&r2=1517865&view=diff
==============================================================================
---
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++
tomcat/sandbox/storeconfig6/trunk/src/main/java/org/apache/catalina/storeconfig/StoreAppender.java
Tue Aug 27 16:12:15 2013
@@ -243,6 +243,9 @@ public class StoreAppender {
if (value == null) {
continue; // Null values are not persisted
}
+ if (value.equals("null")) {
+ continue; // "null" values are not persisted
+ }
Object value2 = IntrospectionUtils.getProperty(bean2,
descriptors[i].getName());
if (value.equals(value2)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
