[jboss-cvs] JBossAS SVN: r110280 - projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection.

[jboss-cvs-commits at lists.jboss.org]

Author: jameslivingston
Date: 2011-01-05 18:20:40 -0500 (Wed, 05 Jan 2011)
New Revision: 110280

Modified:
   projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
Log:
[JBMDR-72] AnnotatedElementMetaDataLoader doesn't work on bridge methods from parent classes

Modified: projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
===================================================================
--- projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2011-01-05 22:24:51 UTC (rev 110279)
+++ projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2011-01-05 23:20:40 UTC (rev 110280)
@@ -323,9 +323,9 @@
       Class<?>[] parameters = bridge.getParameterTypes();
 
       List<Method> matching = new ArrayList<Method>();
-      Method[] all = declaringClass.getDeclaredMethods();
       Class<?> searchClass = declaringClass;
       do {
+         Method[] all = searchClass.getDeclaredMethods();
          for (Method m : all)
          {
             if (m.getName().equals(bridge.getName()) &&
@@ -333,10 +333,9 @@
                   m.equals(bridge) == false &&
                   m.isBridge() == false)
                matching.add(m);
-               searchClass = searchClass.getSuperclass();
          }
+         searchClass = searchClass.getSuperclass();
       } while ((matching.size() == 0) && (searchClass != null));
-      
       if (matching.size() == 1)
          return matching.get(0);