[webbeans-commits] Webbeans SVN: r2396 - extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery.

[webbeans-commits at lists.jboss.org]

Author: cpopetz
Date: 2009-04-11 11:57:00 -0400 (Sat, 11 Apr 2009)
New Revision: 2396

Modified:
   extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
Log:
Don't fail if WEB-INF/classes doesn't exist; this allows running with jetty inside eclipse
without exploding a WAR


Modified: extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java
===================================================================
--- extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java	2009-04-10 23:14:42 UTC (rev 2395)
+++ extensions/trunk/tomcat/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/TomcatWebBeanDiscovery.java	2009-04-11 15:57:00 UTC (rev 2396)
@@ -82,9 +82,12 @@
          if (beans != null)
          {
             File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
-            File[] files = {webInfClasses};
-            scanner.scanDirectories(files);
-            wbUrls.add(beans);
+            if (webInfClasses != null)
+            {
+               File[] files = { webInfClasses };
+               scanner.scanDirectories(files);
+               wbUrls.add(beans);
+            }
          }
       }
       catch (MalformedURLException e)