[jboss-cvs] JBossAS SVN: r87874 - projects/aop/branches/Branch_2_1/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2009-04-27 11:22:20 -0400 (Mon, 27 Apr 2009)
New Revision: 87874

Modified:
   projects/aop/branches/Branch_2_1/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java
Log:
[JBAOP-724] Better error message

Modified: projects/aop/branches/Branch_2_1/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java
===================================================================
--- projects/aop/branches/Branch_2_1/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java	2009-04-27 15:19:54 UTC (rev 87873)
+++ projects/aop/branches/Branch_2_1/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java	2009-04-27 15:22:20 UTC (rev 87874)
@@ -68,6 +68,12 @@
          //Only bother doing all this if we are a different loader from the parent unit 
          Module module = getModuleRecursively(unit);
          
+         if (module == null)
+         {
+            throw new IllegalStateException("No " + Module.class.getName() + 
+                  " attachment could be found in the following deployment unit or its parents: " + unit);
+         }
+         
          ScopedVFSClassLoaderDomain domain = getDomain(registry, unit); //THis might be wrong
          if (domain == null)
          {
@@ -86,11 +92,14 @@
     */
    private static Module getModuleRecursively(DeploymentUnit unit)
    {
+      if (unit == null)
+      {
+         return null;
+      }
       Module module = unit.getAttachment(Module.class);
       if (module == null)
       {
           return getModuleRecursively(unit.getParent());
-          
       }
       return module;
    }