[jboss-cvs] JBossAS SVN: r111167 - projects/ejb3/branches/jboss-ejb3-core-1.3.6_JBPAPP-6287/src/main/java/org/jboss/ejb3/mdb/inflow.

[jboss-cvs-commits at lists.jboss.org]

Author: bershath27
Date: 2011-04-12 06:44:48 -0400 (Tue, 12 Apr 2011)
New Revision: 111167

Modified:
   projects/ejb3/branches/jboss-ejb3-core-1.3.6_JBPAPP-6287/src/main/java/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
Log:
Applied changes to support the following one-off release: 
https://issues.jboss.org/browse/JBPAPP-6287


Modified: projects/ejb3/branches/jboss-ejb3-core-1.3.6_JBPAPP-6287/src/main/java/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-core-1.3.6_JBPAPP-6287/src/main/java/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2011-04-12 06:38:14 UTC (rev 111166)
+++ projects/ejb3/branches/jboss-ejb3-core-1.3.6_JBPAPP-6287/src/main/java/org/jboss/ejb3/mdb/inflow/MessageInflowLocalProxy.java	2011-04-12 10:44:48 UTC (rev 111167)
@@ -21,6 +21,7 @@
  */
 package org.jboss.ejb3.mdb.inflow;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,6 +41,7 @@
 import org.jboss.ejb3.tx.TxUtil;
 import org.jboss.logging.Logger;
 
+
 /**
  * @version <tt>$Revision$</tt>
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -264,6 +266,17 @@
       }
    }
    
+   private static boolean checked(Method method, Class<?> exceptionType)
+   {
+      final Class<?>[] allowedExceptionTypes = method.getExceptionTypes();
+      for (Class<?> allowedExceptionType : allowedExceptionTypes)
+      {
+         if (allowedExceptionType.isAssignableFrom(exceptionType))
+            return true;
+      }
+      return false;
+   } 
+
    /**
     * Delivery.
     * 
@@ -302,6 +315,11 @@
       {
          if (trace)
             log.trace("MessageEndpoint " + getProxyString(proxy) + " delivery error", t);
+         if (t instanceof Exception)
+         {
+            if (!(t instanceof RuntimeException) && !checked(method, t.getClass()))
+               t = new UndeclaredThrowableException(t);
+         }
          if (t instanceof Error || t instanceof RuntimeException)
          {
             if (transaction != null)