Author: markt
Date: Mon Nov 25 20:15:10 2013
New Revision: 1545388
URL: http://svn.apache.org/r1545388
Log:
Avoid possible NPE
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1545388&r1=1545387&r2=1545388&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Nov 25 20:15:10 2013
@@ -5932,7 +5932,7 @@ public class StandardContext extends Con
if (getResources() == null)
return oldContextClassLoader;
- if (getLoader().getClassLoader() != null) {
+ if (getLoader() != null && getLoader().getClassLoader() != null) {
Thread.currentThread().setContextClassLoader
(getLoader().getClassLoader());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
