Don't swallow exceptions in EJB proxy method handler

weld · Dec 3, 2009 · c78384b · c78384b
1 parent 1ab1fef
commit c78384b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java b/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseBeanProxyMethodHandler.java
@@ -120,7 +120,7 @@ public Object invoke(Object self, Method method, Method proceed, Object[] args)
       Class<?> businessInterface = getBusinessInterface(method);
       Object proxiedInstance = reference.getBusinessObject(businessInterface);
       Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance);
-      Object returnValue = Reflections.invokeAndWrap(proxiedMethod, proxiedInstance, args);
+      Object returnValue = Reflections.invoke(proxiedMethod, proxiedInstance, args);
       log.trace(CALL_PROXIED_METHOD, method, proxiedInstance, args, returnValue);
       return returnValue;
    }

diff --git a/impl/src/main/java/org/jboss/weld/util/Reflections.java b/impl/src/main/java/org/jboss/weld/util/Reflections.java
@@ -536,8 +536,7 @@ public static Object invokeAndWrap(Method method, Object instance, Object... par
    {
       try
       {
-         method.setAccessible(true);
-         return method.invoke(instance, parameters);
+         return invoke(method, instance, parameters);
       }
       catch (IllegalArgumentException e)
       {
@@ -553,6 +552,12 @@ public static Object invokeAndWrap(Method method, Object instance, Object... par
       }
    }
 
+   public static Object invoke(Method method, Object instance, Object... parameters) throws IllegalArgumentException, IllegalAccessException, InvocationTargetException
+   {
+      ensureAccessible(method);
+      return method.invoke(instance, parameters);
+   }
+
    public static Object invokeAndWrap(String methodName, Object instance, Object... parameters)
    {
       Class<?>[] parameterTypes = new Class<?>[parameters.length];