1515**************************************************************************** */
1616package org .jpype .proxy ;
1717
18+ import java .lang .invoke .MethodHandles ;
1819import java .lang .reflect .InvocationHandler ;
1920import java .lang .reflect .Method ;
2021import java .lang .reflect .Proxy ;
@@ -35,6 +36,7 @@ public class JPypeProxy implements InvocationHandler
3536 public long cleanup ;
3637 Class <?>[] interfaces ;
3738 ClassLoader cl = ClassLoader .getSystemClassLoader ();
39+ public static Object missing = new Object ();
3840
3941 public static JPypeProxy newProxy (JPypeContext context ,
4042 long instance ,
@@ -69,35 +71,46 @@ public Object newInstance()
6971 public Object invoke (Object proxy , Method method , Object [] args )
7072 throws Throwable
7173 {
72- try
73- {
74- // context.incrementProxy();
75- if (context .isShutdown ())
76- throw new RuntimeException ("Proxy called during shutdown" );
7774
78- // We can save a lot of effort on the C++ side by doing all the
79- // type lookup work here.
80- TypeManager typeManager = context .getTypeManager ();
81- long returnType ;
82- long [] parameterTypes ;
83- synchronized (typeManager )
75+ if (context .isShutdown ())
76+ throw new RuntimeException ("Proxy called during shutdown" );
77+
78+ // We can save a lot of effort on the C++ side by doing all the
79+ // type lookup work here.
80+ TypeManager typeManager = context .getTypeManager ();
81+ long returnType ;
82+ long [] parameterTypes ;
83+ synchronized (typeManager )
84+ {
85+ returnType = typeManager .findClass (method .getReturnType ());
86+ Class <?>[] types = method .getParameterTypes ();
87+ parameterTypes = new long [types .length ];
88+ for (int i = 0 ; i < types .length ; ++i )
8489 {
85- returnType = typeManager .findClass (method .getReturnType ());
86- Class <?>[] types = method .getParameterTypes ();
87- parameterTypes = new long [types .length ];
88- for (int i = 0 ; i < types .length ; ++i )
89- {
90- parameterTypes [i ] = typeManager .findClass (types [i ]);
91- }
90+ parameterTypes [i ] = typeManager .findClass (types [i ]);
9291 }
92+ }
9393
94- return hostInvoke (context .getContext (), method .getName (), instance , returnType , parameterTypes , args );
95- } finally
94+ // Check first to see if Python has implementated it
95+ Object result = hostInvoke (context .getContext (), method .getName (), instance , returnType , parameterTypes , args , missing );
96+
97+ // If we get a good result than return it
98+ if (result != missing )
99+ return result ;
100+
101+ // If it is a default method in the interface then we have to invoke it using special reflection.
102+ if (method .isDefault ())
96103 {
97- // context.decrementProxy();
104+ return MethodHandles .lookup ()
105+ .unreflectSpecial (method , method .getDeclaringClass ())
106+ .bindTo (proxy )
107+ .invokeWithArguments (args );
98108 }
109+
110+ // Else throw... (this should never happen as proxies are checked when created.)
111+ throw new NoSuchMethodError (method .getName ());
99112 }
100113
101114 private static native Object hostInvoke (long context , String name , long pyObject ,
102- long returnType , long [] argsTypes , Object [] args );
115+ long returnType , long [] argsTypes , Object [] args , Object bad );
103116}
0 commit comments