[jboss-cvs] JBossAS SVN: r109622 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3.

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

Author: wolfc
Date: 2010-12-01 08:45:40 -0500 (Wed, 01 Dec 2010)
New Revision: 109622

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-2212: added hacks to counter JBAS-5895 problems


Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2010-12-01 11:04:50 UTC (rev 109621)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2010-12-01 13:45:40 UTC (rev 109622)
@@ -496,11 +496,19 @@
          else
             return null;
       }
+
+      // Everything after this line is a hack.
+
+      // TODO: we have no facility that picks up annotations from shared libs, so lets do some emergency annotation scanning.
+      ApplicationException annotation = exceptionType.getAnnotation(ApplicationException.class);
+      if(annotation != null)
+         return annotation;
       
+      // This feels like a hack around shortcomings in jboss-metadata
       Class[] exceptionTypes = invokedMethod.getExceptionTypes();
       for (Class exceptionClass : exceptionTypes)
       {
-         if (exceptionClass.isAssignableFrom(exceptionType.getClass()))
+         if (exceptionClass.isAssignableFrom(exceptionType))
             return new ApplicationExceptionImpl(false);
       }