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 2012/11/29 18:22:17 UTC
svn commit: r1415283 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Author: rmannibucau
Date: Thu Nov 29 17:22:17 2012
New Revision: 1415283
URL: http://svn.apache.org/viewvc?rev=1415283&view=rev
Log:
TOMEE-615 better test to know if we should throw or not the exception
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1415283&r1=1415282&r2=1415283&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Thu Nov 29 17:22:17 2012
@@ -124,7 +124,7 @@ public class CdiScanner implements Scann
} /* else { don't do it, check is done when we know the beans.xml path --> org.apache.openejb.config.DeploymentLoader.addBeansXmls
throw new WebBeansConfigurationException("Interceptor class : " + clazz.getName() + " is already defined");
}*/
- } else if (beans.webapp && startupObject.isFromWebApp()) {
+ } else if ((beans.webapp && startupObject.isFromWebApp()) || !beans.webapp) {
throw new WebBeansConfigurationException("Could not load interceptor class: " + className);
}
}