From 7aeec0004efb9cce309d802eac5c3824e2a002d2 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Nov 2006 00:01:37 +0000
Subject: [PATCH] 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
---
 java/org/apache/juli/ClassLoaderLogManager.java | 2 +-
 webapps/docs/changelog.xml                      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index ee3af3737..28b3d174d 100644
--- 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 0e1b3e1b2..b7c7c44fe 100644
--- 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">
-- 
2.11.0