[jboss-cvs] JBossAS SVN: r81299 - 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:28:48 -0500 (Wed, 19 Nov 2008)
New Revision: 81299

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
Log:
Optimize urls check.

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:41 UTC (rev 81298)
+++ 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)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.deployers.vfs.webbeans.support;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -76,7 +77,7 @@
          if (deployment != null) // do some more
             wbdi.addWebBeansXmlURL(deployment.getURL());
 
-         WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(wbdi, unit.getClassLoader());
+         List<URL> urls = new ArrayList<URL>();
 
          Iterable<VirtualFile> classpaths = getClassPaths(unit);
          for (VirtualFile cp : classpaths)
@@ -87,7 +88,7 @@
                // add url
                wbdi.addWebBeansXmlURL(wbXml.toURL());
                // add classes
-               module.visit(visitor, ClassFilter.INSTANCE, null, cp.toURL());
+               urls.add(cp.toURL());
             }
          }
 
@@ -97,8 +98,14 @@
          {
             VirtualFile classes = unit.getFile("WEB-INF/classes");
             if (classes != null)
-               module.visit(visitor, ClassFilter.INSTANCE, null, classes.toURL());
+               urls.add(classes.toURL());
          }
+
+         if (urls.isEmpty() == false)
+         {
+            WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(wbdi, unit.getClassLoader());
+            module.visit(visitor, ClassFilter.INSTANCE, null, urls.toArray(new URL[urls.size()]));
+         }
       }
       catch (Exception e)
       {