Author: markt
Date: Sun Feb 27 14:12:39 2011
New Revision: 1075058
URL: http://svn.apache.org/viewvc?rev=1075058&view=rev
Log:
Revert r1075050
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1075058&r1=1075057&r2=1075058&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Sun
Feb 27 14:12:39 2011
@@ -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);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1075058&r1=1075057&r2=1075058&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Feb 27 14:12:39 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
