Author: kkolinko
Date: Tue Jan 8 21:07:06 2013
New Revision: 1430536
URL: http://svn.apache.org/viewvc?rev=1430536&view=rev
Log:
Folowup to r1430182: one more NPE to avoid when stopping a WebappLoader.
This line is absent in Tomcat 8.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1430536&r1=1430535&r2=1430536&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java Tue
Jan 8 21:07:06 2013
@@ -660,8 +660,8 @@ public class WebappLoader extends Lifecy
// Throw away our current class loader
if (classLoader != null) {
((Lifecycle) classLoader).stop();
+ DirContextURLStreamHandler.unbind(classLoader);
}
- DirContextURLStreamHandler.unbind(classLoader);
try {
StandardContext ctx=(StandardContext)container;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
