svn commit: r993525 - /openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java

[co...@apache.org]

Author: covener
Date: Tue Sep  7 20:36:43 2010
New Revision: 993525

URL: http://svn.apache.org/viewvc?rev=993525&view=rev
Log:
[OWB-449] remove incomplete biz method checks from OpenWebBeansEjbInterceptor,
since by definition we only make it to @AroundInvoke for a bizmethod invocation.

Object.class checks already exist in our own javassist proxy / client reference / 
contextual reference for the ejb (EJBBeanProxyHandler)


Modified:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java?rev=993525&r1=993524&r2=993525&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interceptor/OpenWebBeansEjbInterceptor.java Tue Sep  7 20:36:43 2010
@@ -54,7 +54,6 @@ import org.apache.webbeans.decorator.Del
 import org.apache.webbeans.decorator.WebBeansDecoratorConfig;
 import org.apache.webbeans.decorator.WebBeansDecoratorInterceptor;
 import org.apache.webbeans.ejb.common.component.BaseEjbBean;
-import org.apache.webbeans.ejb.common.util.EjbUtility;
 import org.apache.webbeans.inject.OWBInjector;
 import org.apache.webbeans.intercept.InterceptorData;
 import org.apache.webbeans.intercept.InterceptorDataImpl;
@@ -64,7 +63,6 @@ import org.apache.webbeans.intercept.Inv
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.spi.ContextsService;
-import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.SecurityUtil;
 import org.apache.webbeans.util.WebBeansUtil;
 
@@ -487,17 +485,7 @@ public class OpenWebBeansEjbInterceptor 
         CallReturnValue rv = new CallReturnValue();
         InjectionTargetBean<?> injectionTarget = (InjectionTargetBean<?>) threadLocal.get();
         InterceptorDataImpl decoratorInterceptorDataImpl = null;
-
-        String methodName = method.getName();
-        if(ClassUtil.isObjectMethod(methodName) && !methodName.equals("toString"))
-        {
-            logger.trace("Calling method on proxy is restricted except Object.toString(), but current method is Object. [{0}]", methodName);
-        }
-                
-        if (InterceptorUtil.isWebBeansBusinessMethod(method) && 
-                EjbUtility.isBusinessMethod(method, threadLocal.get()))
-        {
-
+        
             List<Object> decorators = null;
             DelegateHandler delegateHandler = null;
             logger.debug("Decorator stack for target {0}", injectionTarget.getDecoratorStack());
@@ -573,8 +561,7 @@ public class OpenWebBeansEjbInterceptor 
                 rv.INTERCEPTOR_OR_DECORATOR_CALL = true;
                 rv.RETURN_VALUE = delegateHandler.invoke(instance, method, null, arguments); 
                 return rv;
-            }
-        }    
+            } 
         
         rv.INTERCEPTOR_OR_DECORATOR_CALL = false;