Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249

Correct system property replacement code so properties of the form ${...}${...} can be used without error.

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

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index d7b9e93..248334f 100644 (file)
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -568,7 +568,7 @@ public class ClassLoaderLogManager extends LogManager {
         String result = str;
         int pos_start = result.indexOf("${");
         if (pos_start != -1) {
-            int pos_end = result.indexOf('}');
+            int pos_end = result.indexOf('}', pos_start);
             if (pos_end != -1) {
                 String propName = result.substring(pos_start + 2, pos_end);
                 String replacement = System.getProperty(propName);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5fbc07d..0ecac3e 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -64,6 +64,11 @@
         response. Patch provided by Paco Soberón. (markt)
       </fix>
       <fix>
+        <bug>51249</bug>: Correct ClassLoaderLogManager system property
+        replacement code so properties of the form ${...}${...} can be used
+        without error. (markt) 
+      </fix>
+      <fix>
         <bug>51274</bug>: Add missing i18n strings in PersistentManagerBase.
         Patch provided by Eiji Takahashi. (markt)
       </fix>