# HG changeset patch
# User jrose
# Date 1358570871 28800
# Node ID 90e4cb6f78bb0551ae23f88dd75cb57aad9d8662
# Parent  0ad964f2ced1b4f12c1b30bd92dceb73ba15f608
8006179: JSR292 MethodHandles lookup with interface using findVirtual()
Reviewed-by: twisti

diff --git a/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/share/classes/java/lang/invoke/DirectMethodHandle.java
--- openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ openjdk/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -44,6 +44,15 @@
         if (!m.isResolved())
             throw new InternalError();
 
+        if (m.getDeclaringClass().isInterface() && !m.isAbstract()) {
+            // Check for corner case: invokeinterface of Object method.
+            MemberName m2 = new MemberName(Object.class, m.getName(), m.getMethodType(), m.getModifiers());
+            m2 = MemberName.getFactory().resolveOrNull(m2, false, null);
+            if (m2 != null && m2.isPublic()) {
+                m = m2;
+            }
+        }
+
         MethodHandleNatives.init(this, (Object) m, doDispatch, lookupClass);
     }