pick the first public candidate

This commit is contained in:
Andy Clement
2015-03-15 19:57:01 -07:00
parent 1228ab174c
commit 8f299288dd
2 changed files with 13 additions and 8 deletions

View File

@@ -26,6 +26,7 @@ import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.security.ProtectionDomain;
import java.util.ArrayList;
@@ -1302,11 +1303,19 @@ public class TypeRegistry {
Class<?> clazz= instance.getClass();
try {
if (clazz.getName().contains("$$Lambda")) {
// There will only be one method, the SAM method
// There may be multiple methods here, we want the public one (I think!)
Method[] ms = instance.getClass().getDeclaredMethods();
Method m = ms[0];
m.setAccessible(true);
Object o = m.invoke(instance, params);
// public java.lang.String basic.LambdaJ$$E002$$Lambda$2/1484594489.m(java.lang.String,java.lang.String)
// private static basic.LambdaJ$Foo basic.LambdaJ$$E002$$Lambda$2/1484594489.get$Lambda(basic.LambdaJ)
Method toUse = null;
for (Method m: ms) {
if (Modifier.isPublic(m.getModifiers())) {
toUse = m;
break;
}
}
toUse.setAccessible(true);
Object o = toUse.invoke(instance, params);
return o;
}
else {

View File

@@ -22,7 +22,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.springsource.loaded.ReloadableType;
import org.springsource.loaded.TypeRegistry;
import org.springsource.loaded.test.infra.ClassPrinter;
import org.springsource.loaded.test.infra.Result;
/**
@@ -363,9 +362,6 @@ public class Java8Tests extends SpringLoadedTests {
r = runUnguarded(simpleClass, "run");
assertEquals(4, r.returnValue);
}
@Ignore
@Test