Author: kkolinko
Date: Wed Jan 27 08:35:14 2010
New Revision: 903564
URL: http://svn.apache.org/viewvc?rev=903564&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48049
Fix copy and paste error so NamingContext.destroySubContext() works correctly
Patch provided by gingyang.xu
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.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=903564&r1=903563&r2=903564&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Jan 27 08:35:14 2010
@@ -138,13 +138,6 @@
+1: markt, rjung, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48049
- Fix copy and paste error and call correct function
- Patch provided by gingyang.xu
- http://svn.apache.org/viewvc?rev=883177&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48311
Only the APR lifecycle listener should try and initialise APR
Patch also syncs all APR lifecycle listener changes from 6.0.x to 5.5.x
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.java?rev=903564&r1=903563&r2=903564&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/naming/NamingContext.java
Wed Jan 27 08:35:14 2010
@@ -466,7 +466,7 @@
if (name.size() > 1) {
if (entry.type == NamingEntry.CONTEXT) {
- ((Context) entry.value).unbind(name.getSuffix(1));
+ ((Context) entry.value).destroySubcontext(name.getSuffix(1));
} else {
throw new NamingException
(sm.getString("namingContext.contextExpected"));
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=903564&r1=903563&r2=903564&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Jan 27
08:35:14 2010
@@ -102,6 +102,11 @@
<bug>47826</bug>: Correct error in debug message in
org.apache.catalina.Bootstrap (markt)
</fix>
+ <fix>
+ <bug>48049</bug>: Fix copy and paste error so
+ <code>NamingContext.destroySubContext()</code> works correctly.
+ Patch provided by gingyang.xu (markt)
+ </fix>
<update>
<bug>48097</bug>: Make WebappClassLoader to do not swallow
AccessControlException. (kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
