Revert r1075050

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1075058 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/CatalinaProperties.java b/java/org/apache/catalina/startup/CatalinaProperties.java
index c114437..213f1ad 100644 (file)
--- a/java/org/apache/catalina/startup/CatalinaProperties.java
+++ b/java/org/apache/catalina/startup/CatalinaProperties.java
@@ -140,9 +140,7 @@ public class CatalinaProperties {
             String name = (String) enumeration.nextElement();
             String value = properties.getProperty(name);
             if (value != null) {
-                // Remove leading/trailing whitespace as that can lead to hard
-                // to diagnose failures
-                System.setProperty(name.trim(), value.trim());
+                System.setProperty(name, value);
             }
         }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 60d9909..b255c37 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,11 +62,6 @@
         (markt)
       </add>
       <fix>
-        <bug>31027</bug>: Trim whitespace from names and values obtained from
-        <code>$CATALINA_BASE/conf/catalina.properties</code> to avoid hard to
-        diagnose errors on startup. (markt)
-      </fix>
-      <fix>
         <bug>48863</bug>: Better logging when specifying an invalid directory
         for a class loader. Based on a patch by Ralf Hauser. (markt)
       </fix>