[jboss-cvs] JBossAS SVN: r78922 - trunk/tomcat/src/main/org/jboss/web/tomcat/service.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-09-29 07:09:47 -0400 (Mon, 29 Sep 2008)
New Revision: 78922

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
JBAS-6002

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-09-29 10:52:04 UTC (rev 78921)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-09-29 11:09:47 UTC (rev 78922)
@@ -447,8 +447,11 @@
       if(object == null)
          throw new IllegalArgumentException("null class");
 
+      ClassLoader loader = object.getClass().getClassLoader();
+      if(loader == null)
+         return false;
       // Check if the object was loaded by a dynamic class loader (e.g. Jasper)
-      String classLoaderName = object.getClass().getClassLoader().getClass().getName();
+      String classLoaderName = loader.getClass().getName();
       if(dynamicClassLoaders.contains(classLoaderName))
          return true;