enhanced bridge method handling

2 files changed, 27 insertions, 15 deletions

diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index 1957f4f9..626facb8 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -3106,7 +3106,7 @@
         references (remove #(= :gen-class (first %)) references)]
     `(do
        (clojure.core/in-ns '~name)
-       ~@(when (and (not= name '~'clojure.core) (not-any? #(= :refer-clojure (first %)) references))
+       ~@(when (and (not= name 'clojure.core) (not-any? #(= :refer-clojure (first %)) references))
            `((clojure.core/refer '~'clojure.core)))
        ~@(map process-reference references))))
 
diff --git a/src/jvm/clojure/lang/Reflector.java b/src/jvm/clojure/lang/Reflector.java
index 0eaf1123..c553a8b1 100644
--- a/src/jvm/clojure/lang/Reflector.java
+++ b/src/jvm/clojure/lang/Reflector.java
@@ -299,27 +299,39 @@ static public Field getField(Class c, String name, boolean getStatics){
 static public List getMethods(Class c, int arity, String name, boolean getStatics){
 	Method[] allmethods = c.getMethods();
 	ArrayList methods = new ArrayList();
+	ArrayList bridgeMethods = new ArrayList();
 	for(int i = 0; i < allmethods.length; i++)
 		{
-		try
+		Method method = allmethods[i];
+		if(name.equals(method.getName())
+		   && Modifier.isStatic(method.getModifiers()) == getStatics
+		   && method.getParameterTypes().length == arity)
 			{
-			Method method = allmethods[i];
-			if(name.equals(method.getName())
-			   && Modifier.isStatic(method.getModifiers()) == getStatics
-			   && method.getParameterTypes().length == arity
-			   && (!method.isBridge()
-			       || (c == StringBuilder.class &&
-			          c.getMethod(method.getName(), method.getParameterTypes())
-					.equals(method))))
+			try
+				{
+				if(method.isBridge()
+				   && c.getMethod(method.getName(), method.getParameterTypes())
+						.equals(method))
+					bridgeMethods.add(method);
+				else
+					methods.add(method);
+				}
+			catch(NoSuchMethodException e)
 				{
-				methods.add(allmethods[i]);
 				}
 			}
-		catch(NoSuchMethodException e)
-			{
-			throw new RuntimeException(e);
-			}
+//			   && (!method.isBridge()
+//			       || (c == StringBuilder.class &&
+//			          c.getMethod(method.getName(), method.getParameterTypes())
+//					.equals(method))))
+//				{
+//				methods.add(allmethods[i]);
+//				}
 		}
+
+	if(methods.isEmpty())
+		methods.addAll(bridgeMethods);
+	
 	if(!getStatics && c.isInterface())
 		{
 		allmethods = Object.class.getMethods();