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/10/06 17:24:36 UTC
svn commit: r1395096 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Author: rmannibucau
Date: Sat Oct 6 15:24:36 2012
New Revision: 1395096
URL: http://svn.apache.org/viewvc?rev=1395096&view=rev
Log:
TOMEE-445 catching NoSuchObjectException - can be thrown directly too so both catch are needed
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java?rev=1395096&r1=1395095&r2=1395096&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java Sat Oct 6 15:24:36 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.cdi;
import org.apache.openejb.BeanContext;
import org.apache.openejb.BeanType;
+import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.classic.ProxyInterfaceResolver;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.component.WebBeansType;
@@ -181,6 +182,13 @@ public class CdiEjbBean<T> extends BaseE
if (!(nsoe.getCause() instanceof NoSuchObjectException)) {
throw nsoe;
}
+ } catch (Exception e) {
+ if (!(e instanceof NoSuchObjectException)) {
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException) e;
+ }
+ throw new OpenEJBRuntimeException(e);
+ }
}
}
}