svn commit: r1631116 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java cdi/ThreadSingletonServiceImpl.java

[rm...@apache.org]

Author: rmannibucau
Date: Sat Oct 11 20:43:55 2014
New Revision: 1631116

URL: http://svn.apache.org/r1631116
Log:
as ValidationException, DeploymentException shouldn't be wrapped

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1631116&r1=1631115&r2=1631116&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Sat Oct 11 20:43:55 2014
@@ -152,6 +152,7 @@ import javax.enterprise.context.Dependen
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.DeploymentException;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
@@ -946,6 +947,8 @@ public class Assembler extends Assembler
             return appContext;
         } catch (final ValidationException ve) {
             throw ve;
+        } catch (final DeploymentException ve) {
+            throw ve;
         } catch (final Throwable t) {
             try {
                 destroyApplication(appInfo);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1631116&r1=1631115&r2=1631116&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java Sat Oct 11 20:43:55 2014
@@ -46,6 +46,7 @@ import org.apache.webbeans.spi.Transacti
 import org.apache.webbeans.spi.adaptor.ELAdaptor;
 import org.apache.webbeans.web.intercept.RequestScopedBeanInterceptorHandler;
 
+import javax.enterprise.inject.spi.DeploymentException;
 import javax.transaction.Transactional;
 import java.util.Collections;
 import java.util.Comparator;
@@ -168,7 +169,7 @@ public class ThreadSingletonServiceImpl 
             try {
                 webBeansContext.getService(ContainerLifecycle.class).startApplication(startupObject);
             } catch (final Exception e) {
-                throw new OpenEJBRuntimeException("couldn't start owb context", e);
+                throw new DeploymentException("couldn't start owb context", e);
             }
         } finally {
             contextExited(old);