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

Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/12 12:48:34 UTC

svn commit: r1617446 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java

Author: rmannibucau
Date: Tue Aug 12 10:48:33 2014
New Revision: 1617446

URL: http://svn.apache.org/r1617446
Log:
avoid npe

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1617446&r1=1617445&r2=1617446&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Tue Aug 12 10:48:33 2014
@@ -190,7 +190,7 @@ public class CdiScanner implements Scann
                     information = beanInfoService.createBeanArchiveInformation(beans, classLoader, next.discoveryMode == null? "ALL" : next.discoveryMode); // this fallback is 100% for tests, TODO: get rid of it (AppComposer)
                     // TODO: log a warn is discoveryModes.get(key) == null
                     try {
-                        beanInfoService.getBeanArchiveInfo().put(next.uri.toURL(), information);
+                        beanInfoService.getBeanArchiveInfo().put(next.uri == null ? null : next.uri.toURL(), information);
                     } catch (final MalformedURLException e) {
                         throw new IllegalStateException(e);
                     }