Modify WELD-1234 fix to avoid calling SessionObjectReference.isRemove…

…d() on every invocation.
weld · Jul 3, 2023 · 846c02a · 846c02a
1 parent c538ec4
commit 846c02a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/modules/ejb/src/main/java/org/jboss/weld/module/ejb/EnterpriseBeanProxyMethodHandler.java b/modules/ejb/src/main/java/org/jboss/weld/module/ejb/EnterpriseBeanProxyMethodHandler.java
@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
 
 import org.jboss.weld.annotated.enhanced.MethodSignature;
 import org.jboss.weld.annotated.enhanced.jlr.MethodSignatureImpl;
@@ -123,17 +124,21 @@ public Object invoke(Object self, Method method, Method proceed, Object[] args)
             throw BeanLogger.LOG.invalidRemoveMethodInvocation(method);
         }
         Class<?> businessInterface = getBusinessInterface(method);
-        if (reference.isRemoved() && isToStringMethod(method)) {
-            return businessInterface.getName() + " [REMOVED]";
-        }
         Object proxiedInstance = reference.getBusinessObject(businessInterface);
 
         if (!Modifier.isPublic(method.getModifiers())) {
             throw new EJBException("Not a business method " + method.toString() +". Do not call non-public methods on EJB's.");
         }
-        Object returnValue = Reflections.invokeAndUnwrap(proxiedInstance, method, args);
-        BeanLogger.LOG.callProxiedMethod(method, proxiedInstance, args, returnValue);
-        return returnValue;
+        try {
+            Object returnValue = Reflections.invokeAndUnwrap(proxiedInstance, method, args);
+            BeanLogger.LOG.callProxiedMethod(method, proxiedInstance, args, returnValue);
+            return returnValue;
+        } catch (NoSuchEJBException e) {
+            if (isToStringMethod(method)) {
+                return businessInterface.getName() + " [REMOVED]";
+            }
+            throw e;
+        }
     }
 
     private boolean isRemoveMethod(Method method) {