[jbossweb-commits] JBossWeb SVN: r1545 - trunk/java/org/apache/catalina/core.
Author: remy.maucherat(a)jboss.com
Date: 2010-08-26 11:15:51 -0400 (Thu, 26 Aug 2010)
New Revision: 1545
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
- Add a null check to make JF happy.
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2010-08-26 09:46:12 UTC (rev
1544)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2010-08-26 15:15:51 UTC (rev
1545)
@@ -4202,7 +4202,7 @@
if (getResources() == null)
return oldContextClassLoader;
- if (getLoader().getClassLoader() != null) {
+ if ((getLoader() != null) && getLoader().getClassLoader() != null) {
Thread.currentThread().setContextClassLoader
(getLoader().getClassLoader());
}