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

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

Author: alesj
Date: 2011-01-06 09:25:29 -0500 (Thu, 06 Jan 2011)
New Revision: 110299

Modified:
   projects/jboss-mdr/branches/Branch_2_2/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_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-06 14:21:02 UTC (rev 110298)
+++ projects/jboss-mdr/branches/Branch_2_2/src/main/java/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java	2011-01-06 14:25:29 UTC (rev 110299)
@@ -21,6 +21,16 @@
 */
 package org.jboss.metadata.plugins.loader.reflection;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import org.jboss.logging.Logger;
 import org.jboss.metadata.plugins.loader.BasicMetaDataLoader;
 import org.jboss.metadata.plugins.loader.SimpleMetaDataLoader;
@@ -37,12 +47,6 @@
 import org.jboss.util.JBossStringBuilder;
 import org.jboss.util.Strings;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * AnnotatedElementMetaDataLoader.
  * 
@@ -324,7 +328,9 @@
 
       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)
          {
@@ -335,7 +341,8 @@
                matching.add(m);
          }
          searchClass = searchClass.getSuperclass();
-      } while ((matching.size() == 0) && (searchClass != null));
+      }
+
       if (matching.size() == 1)
          return matching.get(0);