Author: kkolinko Date: Thu Jun 9 13:45:10 2011 New Revision: 1133871 URL: http://svn.apache.org/viewvc?rev=1133871&view=rev Log: proposal
Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1133871&r1=1133870&r2=1133871&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 9 13:45:10 2011 @@ -169,6 +169,24 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1130625&view=rev +1: markt, kkolinko -1: + kkolinko: Alternative proposal below. + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249 + Improve system property replacement code in ClassLoaderLogManager of Tomcat JULI. + 1) Tests + svn copy "^/tomcat/trunk/test/org/apache/juli" "test/org/apache/juli" + 2) Patch (backport of r1133857) + http://people.apache.org/~kkolinko/patches/2011-06-09_tc6_ClassLoaderLogManager.patch + It fixes the following issues: + 1. Correctly search for "}" so properties in the form "}${property}" are + correctly replaced. This is BZ 51249. + Note, that ${property}${property} is already working in 6.0.32, thanks to recursion. + 2. Do not stop processing on first unrecognized property. + The old code did not perform recursion if replacement failed. + 3. Do not call System.getProperty() for empty property name, + which was throwing IllegalArgumentException. + +1: kkolinko + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309 Correct logic in catalina.sh stop when using a PID file to ensure the correct --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org