WELD-477 private final methods are ignored when checking proxiability

weld · Apr 13, 2010 · 9e64a76 · 9e64a76
1 parent d47490f
commit 9e64a76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/util/Proxies.java b/impl/src/main/java/org/jboss/weld/util/Proxies.java
@@ -326,7 +326,7 @@ else if (Modifier.isPrivate(constructor.getModifiers()))
       }
       else if (Reflections.isTypeOrAnyMethodFinal(clazz))
       {
-         return new UnproxyableResolutionException(NOT_PROXYABLE_FINAL_TYPE_OR_METHOD, clazz, Reflections.getFinalMethodOrType(clazz));
+         return new UnproxyableResolutionException(NOT_PROXYABLE_FINAL_TYPE_OR_METHOD, clazz, Reflections.getNonPrivateFinalMethodOrType(clazz));
       }
       else if (clazz.isPrimitive())
       {

diff --git a/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java b/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
@@ -147,6 +147,17 @@ public static boolean isFinal(Member member)
       return Modifier.isFinal(member.getModifiers());
    }
 
+   /**
+    * Checks if member is private
+    *
+    * @param member The member to check
+    * @return True if final, false otherwise
+    */
+   public static boolean isPrivate(Member member)
+   {
+      return Modifier.isPrivate(member.getModifiers());
+   }
+
    /**
     * Checks if type or member is final
     * 
@@ -155,18 +166,18 @@ public static boolean isFinal(Member member)
     */
    public static boolean isTypeOrAnyMethodFinal(Class<?> type)
    {
-      return getFinalMethodOrType(type) != null;
+      return getNonPrivateFinalMethodOrType(type) != null;
    }
 
-   public static Object getFinalMethodOrType(Class<?> type) 
+   public static Object getNonPrivateFinalMethodOrType(Class<?> type)
    {
       if (isFinal(type))
       {
          return type;
       }
       for (Method method : type.getDeclaredMethods())
       {
-         if (isFinal(method))
+         if (isFinal(method) && !isPrivate(method))
          {
             return method;
          }

diff --git a/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java b/tests/src/test/java/org/jboss/weld/tests/proxy/weld477/ProxiabilityTest.java
@@ -28,7 +28,7 @@
 public class ProxiabilityTest extends AbstractWeldTest
 {
 
-   @Test(description = "https://jira.jboss.org/jira/browse/WELD-477", groups="broken")
+   @Test(description = "https://jira.jboss.org/jira/browse/WELD-477")
    public void testClassWithPrivateFinalMethodsProxyable()
    {
        InjectedClass injectedClassInstance = getReference(InjectedClass.class);