Fix encapsulated default method lookup on interfaces #614

Use MethodHandles.privateLookupIn() instead of plain MethodHandles.lookup() to enable private lookups on Java 9.
redis · Sep 28, 2017 · f49c8c0 · f49c8c0
1 parent d336f73
commit f49c8c0
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/internal/DefaultMethods.java b/src/main/java/com/lambdaworks/redis/internal/DefaultMethods.java
@@ -82,13 +82,39 @@ boolean isAvailable() {
          */
         ENCAPSULATED {
 
+            Method privateLookupIn = findBridgeMethod();
+
             @Override
             MethodHandle lookup(Method method) throws ReflectiveOperationException {
 
                 MethodType methodType = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
 
-                return MethodHandles.lookup().findSpecial(method.getDeclaringClass(), method.getName(), methodType,
-                        method.getDeclaringClass());
+                return getLookup(method.getDeclaringClass()).findSpecial(method.getDeclaringClass(), method.getName(),
+                        methodType, method.getDeclaringClass());
+            }
+
+            private Method findBridgeMethod() {
+
+                try {
+                    return MethodHandles.class.getDeclaredMethod("privateLookupIn", Class.class, Lookup.class);
+                } catch (ReflectiveOperationException e) {
+                    return null;
+                }
+            }
+
+            private Lookup getLookup(Class<?> declaringClass) {
+
+                Lookup lookup = MethodHandles.lookup();
+
+                if (privateLookupIn != null) {
+                    try {
+                        return (Lookup) privateLookupIn.invoke(null, declaringClass, lookup);
+                    } catch (ReflectiveOperationException e) {
+                        return lookup;
+                    }
+                }
+
+                return lookup;
             }
 
             @Override