You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openwebbeans.apache.org by st...@apache.org on 2010/02/18 22:41:00 UTC

svn commit: r911605 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java

Author: struberg
Date: Thu Feb 18 21:41:00 2010
New Revision: 911605

URL: http://svn.apache.org/viewvc?rev=911605&view=rev
Log:
OWB-287 skip WAR scanning if no context is given

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java?rev=911605&r1=911604&r2=911605&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ee/deployer/DefaultScannerService.java Thu Feb 18 21:41:00 2010
@@ -129,7 +129,13 @@
      */
     private URL createURLFromWARFile() throws Exception
     {
-        URL url = this.servletContext.getResource("/WEB-INF/beans.xml");
+        if (servletContext == null)
+        {
+            // this may happen if we are running in a test container, in IDE development, etc
+            return null;
+        }
+        
+        URL url = servletContext.getResource("/WEB-INF/beans.xml");
 
         if (url != null)
         {