Port fix for bug 37509.

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

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index ee3af37..28b3d17 100644 (file)
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -453,7 +453,7 @@ public class ClassLoaderLogManager extends LogManager {
      * @return the modified string
      */
     protected String replace(String str) {
-        String result = str.trim();
+        String result = str;
         if (result.startsWith("${")) {
             int pos = result.indexOf('}');
             if (pos != -1) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0e1b3e1..b7c7c44 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -24,6 +24,10 @@
       <fix>
         <bug>40844</bug> Missing syncs in JDBCRealm. (markt)
       </fix>
+      <fix>
+        <bug>37509</bug>: Do not remove whitespace from the end of values
+        defined in logging.properties files. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">