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

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

Author: alesj
Date: 2011-01-06 09:27:36 -0500 (Thu, 06 Jan 2011)
New Revision: 110300

Modified:
   projects/jboss-mdr/branches/Branch_2_0/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
Log:
[JBMDR-72]; more matching, break on Object class

Modified: projects/jboss-mdr/branches/Branch_2_0/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java
===================================================================
--- projects/jboss-mdr/branches/Branch_2_0/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2011-01-06 14:25:29 UTC (rev 110299)
+++ projects/jboss-mdr/branches/Branch_2_0/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2011-01-06 14:27:36 UTC (rev 110300)
@@ -306,7 +306,8 @@
       List<Method> matching = new ArrayList<Method>();
       Class<?> searchClass = declaringClass;
 
-      do {
+      while (searchClass != null && Object.class.equals(searchClass) == false)
+      {
 	      Method[] all = searchClass.getDeclaredMethods();
 	      for (Method m : all)
 	      {
@@ -317,9 +318,8 @@
 	            matching.add(m);
 	      }
 	      searchClass = searchClass.getSuperclass();
-      } while ((matching.size() == 0) && (searchClass != null));
+      }
 
-
       if (matching.size() == 1)
          return matching.get(0);