WELD-1852 Fix invalid warning

weld · Jan 30, 2015 · 815672f · 815672f
1 parent f2f9a93
commit 815672f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java b/...src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanArchiveScanner.java
@@ -41,7 +41,7 @@ public class WebAppBeanArchiveScanner extends DefaultBeanArchiveScanner {
 
     static final String WEB_INF_CLASSES_BEANS_XML = "/WEB-INF/classes/META-INF/beans.xml";
 
-    static final String[] RESOURCES = {WEB_INF_BEANS_XML, WEB_INF_CLASSES_BEANS_XML};
+    static final String[] RESOURCES = { WEB_INF_BEANS_XML, WEB_INF_CLASSES_BEANS_XML };
 
     static final String WEB_INF_CLASSES = "/WEB-INF/classes";
 
@@ -67,13 +67,14 @@ public Map<URL, ScanResult> scan() {
             for (String resource : RESOURCES) {
                 URL resourceUrl;
                 resourceUrl = servletContext.getResource(resource);
-                if (beansXmlUrl != null) {
-                    WeldServletLogger.LOG.foundBothConfiguration(beansXmlUrl);
-                } else {
-                    beansXmlUrl = resourceUrl;
+                if (resourceUrl != null) {
+                    if (beansXmlUrl != null) {
+                        WeldServletLogger.LOG.foundBothConfiguration(beansXmlUrl);
+                    } else {
+                        beansXmlUrl = resourceUrl;
+                    }
                 }
             }
-
             if (beansXmlUrl != null) {
                 BeansXml beansXml = bootstrap.parse(beansXmlUrl);
                 if (accept(beansXml)) {