Merge pull request #1 from stuartwdouglas/master

Remove code that treated unchecked exceptions in the throws cause as an application exception

tx/impl/src/main/java/org/jboss/ejb3/tx2/impl/CMTTxInterceptor.java

@@ -63,7 +63,6 @@ public abstract class CMTTxInterceptor
 
    /**
     * Returns the {@link TransactionalComponent} applicable for this interceptor
-    *
     * @return
     */
    protected abstract TransactionalComponent getTransactionalComponent();
@@ -148,13 +147,6 @@ protected void handleInCallerTx(InvocationContext invocation, Throwable t, Trans
          throw (Exception) t;
       }
 
-      // if it's part of throws clause, then treat it as an application exception (section 14.2.1 of EJB3.1 spec)
-      Method invokedMethod = invocation.getMethod();
-      if (invokedMethod != null && this.isPartOfThrowsClause(invokedMethod, t))
-      {
-         throw (Exception) t;
-      }
-
       // if it's not EJBTransactionRolledbackException
       if (!(t instanceof EJBTransactionRolledbackException))
       {
@@ -186,7 +178,7 @@ else if (t instanceof RuntimeException)
       throw (Exception) t;
    }
 
-   protected void handleExceptionInOurTx(InvocationContext invocation, Throwable t, Transaction tx) throws Exception
+   public void handleExceptionInOurTx(InvocationContext invocation, Throwable t, Transaction tx) throws Exception
    {
       ApplicationException ae = this.getApplicationException(t.getClass());
       if (ae != null)
@@ -198,13 +190,6 @@ protected void handleExceptionInOurTx(InvocationContext invocation, Throwable t,
          throw (Exception) t;
       }
 
-      // if it's part of throws clause, then treat it as an application exception (section 14.2.1 of EJB3.1 spec)
-      Method invokedMethod = invocation.getMethod();
-      if (invokedMethod != null && this.isPartOfThrowsClause(invokedMethod, t))
-      {
-         throw (Exception) t;
-      }
-
       // if it's neither EJBException nor RemoteException
       if (!(t instanceof EJBException || t instanceof RemoteException))
       {
@@ -492,25 +477,4 @@ private ApplicationException getApplicationException(Class<?> exceptionClass)
       TransactionalComponent txComponent = this.getTransactionalComponent();
       return txComponent.getApplicationException(exceptionClass);
    }
-
-   /**
-    * Returns true if the passed {@link Throwable} is part of the throws clause of the passed {@link Method}.
-    * Else, returns false.
-    *
-    * @param m The method whose throws clause will be checked
-    * @param t The Throwable which will be compared against the throws clause of the passed method
-    * @return
-    */
-   private boolean isPartOfThrowsClause(Method m, Throwable t)
-   {
-      Class<?>[] exceptionTypes = m.getExceptionTypes();
-      for (Class<?> exceptionType : exceptionTypes)
-      {
-         if (exceptionType.equals(t.getClass()))
-         {
-            return true;
-         }
-      }
-      return false;
-   }
 }