StringBuffer ambiguity bug #1145660 fixed. Earlier the choice of suitable methods in reflectionutility was handled incorrectly. We now sort out the bridge methods first.

dyrby76 · dyrby76 · commit dda1eca509a9 · 2005-02-25T22:24:02.000Z
git-svn-id: file:///tmp/test-svn/trunk@2897 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/Version.java b/dynamicjava/src/koala/Version.java
@@ -53,7 +53,7 @@
  * This file is copied to Version.java by the build process, which also
  * fills in the right values of the date and time.
  *
- * This javadoc corresponds to build drjava-20050206-2235;
+ * This javadoc corresponds to build drjava-20050225-2221;
  *
  * @version $Id$
  */
@@ -62,7 +62,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String BUILD_TIME_STRING = "20050206-2235";
+  private static final String BUILD_TIME_STRING = "20050225-2221";
 
   /** A {@link Date} version of the build time. */
   private static final Date BUILD_TIME = _getBuildDate();
diff --git a/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilities.java b/dynamicjava/src/koala/dynamicjava/util/ReflectionUtilities.java
@@ -355,12 +355,14 @@ public static Field getOuterField(Class<?> cl, String name)
    */
   protected static Method selectTheMostSpecificMethod(List<Method> list) {
     if (list.isEmpty()) return null;
-    
+        
     Iterator<Method> it = list.iterator();
     Method best = it.next();
     Method ambiguous = null; // there is no ambiguous other method at first
     while (it.hasNext()) {
       Method curr = it.next();
+      if(TigerUtilities.isBridge(curr)) continue; //If the method is a bridge method, dont consider it, go to the next
+
       Class<?>[] a1 = best.getParameterTypes();
       Class<?>[] a2 = curr.getParameterTypes();
       
@@ -402,14 +404,6 @@ else if (better2) {
       }
     }
     if (ambiguous != null) {
-      boolean bestBridge = TigerUtilities.isBridge(best);
-      boolean ambiBridge = TigerUtilities.isBridge(ambiguous);
-      if (bestBridge && !ambiBridge) {
-        return ambiguous;
-      }
-      else if (!bestBridge && ambiBridge) {
-        return best;
-      }
       throw new AmbiguousMethodException(best, ambiguous);
     }
     return best;
