svn commit: r1101906 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java

[xu...@apache.org]

Author: xuhaihong
Date: Wed May 11 14:53:52 2011
New Revision: 1101906

URL: http://svn.apache.org/viewvc?rev=1101906&view=rev
Log:
OPENEJB-1548 "PreDestroy annotation can only be applied to the ejbRemove method" rule should only apply to the very class that implement SessionBean interface. (Patch from Shawn Jiang)

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java?rev=1101906&r1=1101905&r2=1101906&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java Wed May 11 14:53:52 2011
@@ -251,14 +251,14 @@ public class CheckCallbacks extends Vali
 
     private void checkAroundTypeInvoke(String aroundType, Class ejbClass, String declaringClassName, String declaringMethodName, String componentName) {
         try {
-            Class<?> delcaringClass = null;
+            Class<?> declaringClass = null;
             try {
-                delcaringClass = declaringClassName == null ? ejbClass : loadClass(declaringClassName);
+                declaringClass = declaringClassName == null ? ejbClass : loadClass(declaringClassName);
             } catch (OpenEJBException e) {
                 fail(componentName, "missing.class", declaringClassName, aroundType, ejbClass.getName());
                 return;
             }
-            Method method = getMethod(delcaringClass, declaringMethodName, InvocationContext.class);
+            Method method = getMethod(declaringClass, declaringMethodName, InvocationContext.class);
 
             Class<?> returnType = method.getReturnType();
 
@@ -312,7 +312,7 @@ public class CheckCallbacks extends Vali
                 return;
             }
             Method method = getMethod(delcaringClass, callback.getMethodName(), parameterTypes);
-            if (implementsSessionBean(ejbClass)) {
+            if (implementsSessionBean(delcaringClass)) {
                 SessionBean sb = (SessionBean) bean;
                 if ("PreDestroy".equals(type)) {
                     if (!callback.getMethodName().equals("ejbRemove"))