Author: kkolinko
Date: Sun Oct 4 20:36:45 2009
New Revision: 821606
URL: http://svn.apache.org/viewvc?rev=821606&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47826
Correct broken debug message
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=821606&r1=821605&r2=821606&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Oct 4 20:36:45 2009
@@ -143,13 +143,6 @@
+1: rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47826
- Correct error in debug message in org.apache.catalina.Bootstrap.
- Already fixed in TC 6.0.
- http://svn.apache.org/viewvc?rev=817110&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Upgrade to Commons-Pool 1.5.3. 1.5.2 had a leak
http://svn.apache.org/viewvc?rev=821412&view=rev
+1: markt, kkolinko, rjung
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/Bootstrap.java?rev=821606&r1=821605&r2=821606&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Sun Oct 4 20:36:45 2009
@@ -148,7 +148,7 @@
}
}
if (replace && log.isDebugEnabled())
- log.debug("Expanded " + before + " to " + replace);
+ log.debug("Expanded " + before + " to " + repository);
// Check for a JAR URL repository
try {
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=821606&r1=821605&r2=821606&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Oct 4
20:36:45 2009
@@ -66,6 +66,10 @@
old method. Patch provided by Christopher Schultz. (markt)
</fix>
<fix>
+ <bug>47826</bug>: Correct error in debug message in
+ org.apache.catalina.Bootstrap (markt)
+ </fix>
+ <fix>
Add an additional permission required by JULI when running under newer
JDKs and a security manager. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
