[jboss-cvs] JBossAS SVN: r81300 - projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support.

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

Author: alesj
Date: 2008-11-19 11:43:01 -0500 (Wed, 19 Nov 2008)
New Revision: 81300

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
Log:
Move Module usage to where it's needed.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java	2008-11-19 16:28:48 UTC (rev 81299)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java	2008-11-19 16:43:01 UTC (rev 81300)
@@ -61,20 +61,7 @@
 
       try
       {
-         Module module = unit.getAttachment(Module.class);
-         if (module == null)
-         {
-            VFSDeploymentUnit parent = unit.getParent();
-            while(parent != null && module == null)
-            {
-               module = parent.getAttachment(Module.class);
-               parent = parent.getParent();
-            }
-            if (module == null)
-               throw new IllegalArgumentException("No module in deployment unit's hierarchy: " + unit.getName());
-         }
-
-         if (deployment != null) // do some more
+         if (deployment != null) // do some more stuff ...
             wbdi.addWebBeansXmlURL(deployment.getURL());
 
          List<URL> urls = new ArrayList<URL>();
@@ -103,6 +90,19 @@
 
          if (urls.isEmpty() == false)
          {
+            Module module = unit.getAttachment(Module.class);
+            if (module == null)
+            {
+               VFSDeploymentUnit parent = unit.getParent();
+               while(parent != null && module == null)
+               {
+                  module = parent.getAttachment(Module.class);
+                  parent = parent.getParent();
+               }
+               if (module == null)
+                  throw new DeploymentException("No module in deployment unit's hierarchy: " + unit.getName());
+            }
+
             WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(wbdi, unit.getClassLoader());
             module.visit(visitor, ClassFilter.INSTANCE, null, urls.toArray(new URL[urls.size()]));
          }