From f2508046c38348ef41b1d6e8ea822f77463389b0 Mon Sep 17 00:00:00 2001
From: jrose <unknown>
Date: Thu, 12 Jul 2012 00:12:28 -0700
Subject: [PATCH] 7087658: MethodHandles.Lookup.findVirtual is confused by
 interface methods that are multiply inherited Reviewed-by: twisti

---
 src/share/classes/java/lang/invoke/MemberName.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/java/lang/invoke/MemberName.java b/src/share/classes/java/lang/invoke/MemberName.java
index 5a431a53a..34789cbe0 100644
--- a/src/share/classes/java/lang/invoke/MemberName.java
+++ b/src/share/classes/java/lang/invoke/MemberName.java
@@ -622,8 +622,12 @@ import static java.lang.invoke.MethodHandleStatics.*;
             MemberName[] buf = { m };
             int n = MethodHandleNatives.getMembers(m.getDeclaringClass(),
                     m.getName(), matchSig, matchFlags, lookupClass, 0, buf);
-            if (n != 1)  return false;
-            return m.isResolved();
+            if (n == 0 || !m.isResolved())
+                return false;  // no result
+            else if (n == 1 || m.clazz.isInterface())
+                return true;   // unique result, or multiple inheritance is OK
+            else
+                return false;  // ambiguous result (can this happen?)
         }
         /** Produce a resolved version of the given member.
          *  Super types are searched (for inherited members) if {@code searchSupers} is true.
-- 
GitLab