stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-01-07 15:15:38 -08:00
commit 78dca77135
5 changed files with 6 additions and 17 deletions
nashorn
src/jdk.dynalink/share/classes/jdk/dynalink/beans
ClassLinker.javaOverloadedDynamicMethod.java
test/script/basic
JDK-8134488.jsJDK-8134490.jsJDK-8134939.js

2
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java

@ -102,7 +102,7 @@ class ClassLinker extends BeanLinker {
setPropertyGetter("static", FOR_CLASS, ValidationType.EXACT_CLASS);
}
private static final MethodHandle FOR_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClass.class,
private static final MethodHandle FOR_CLASS = Lookup.PUBLIC.findStatic(StaticClass.class,
"forClass", MethodType.methodType(StaticClass.class, Class.class));
}

15
nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java

@ -112,8 +112,7 @@ class OverloadedDynamicMethod extends DynamicMethod {
/**
* Holds a list of all methods.
*/
private final LinkedList<SingleDynamicMethod> methods;
private final ClassLoader classLoader;
private final LinkedList<SingleDynamicMethod> methods = new LinkedList<>();
/**
* Creates a new overloaded dynamic method.
@ -122,13 +121,7 @@ class OverloadedDynamicMethod extends DynamicMethod {
* @param name the name of the method
*/
OverloadedDynamicMethod(final Class<?> clazz, final String name) {
this(new LinkedList<SingleDynamicMethod>(), clazz.getClassLoader(), getClassAndMethodName(clazz, name));
}
private OverloadedDynamicMethod(final LinkedList<SingleDynamicMethod> methods, final ClassLoader classLoader, final String name) {
super(name);
this.methods = methods;
this.classLoader = classLoader;
super(getClassAndMethodName(clazz, name));
}
@Override
@ -288,10 +281,6 @@ class OverloadedDynamicMethod extends DynamicMethod {
return b.toString();
};
ClassLoader getClassLoader() {
return classLoader;
}
private static boolean isApplicableDynamically(final LinkerServices linkerServices, final MethodType callSiteType,
final SingleDynamicMethod m) {
final MethodType methodType = m.getMethodType();

2
nashorn/test/script/basic/JDK-8134488.js

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it

2
nashorn/test/script/basic/JDK-8134490.js

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it

2
nashorn/test/script/basic/JDK-8134939.js

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it