tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1130625 - in /tomcat/trunk: java/org/apache/juli/ClassLoaderLogManager.java webapps/docs/changelog.xml
Date Thu, 02 Jun 2011 16:11:17 GMT
Author: markt
Date: Thu Jun  2 16:11:16 2011
New Revision: 1130625

URL: http://svn.apache.org/viewvc?rev=1130625&view=rev
Log:
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.

Modified:
    tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1130625&r1=1130624&r2=1130625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Jun  2 16:11:16 2011
@@ -568,7 +568,7 @@ public class ClassLoaderLogManager exten
         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);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1130625&r1=1130624&r2=1130625&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun  2 16:11:16 2011
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message