archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8165198: Inconsistent values with JavaImporter after accessing undefined variable

Browse source 
Reviewed-by: sundar, hannesw
This commit is contained in:
Priya Lakshmi Muthuswamy 2017-10-23 13:03:01 +02:00 • committed by Hannes Wallnöfer
parent 6bfb868454
commit 6a0b70e242
4 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java
View file

@ -2136,7 +2136,7 @@ public abstract class ScriptObject implements PropertyAccess, Cloneable {
// Similar to getProtoSwitchPoints method above, but used for additional prototype switchpoints of
// properties that are known not to exist, e.g. the original property name in a __noSuchProperty__ invocation.
private SwitchPoint getProtoSwitchPoint(final String name) {
final SwitchPoint getProtoSwitchPoint(final String name) {
if (getProto() == null) {
return null;
}

4
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java
View file

@ -138,9 +138,9 @@ public final class WithObject extends Scope {
find = expression.findProperty(fallBack, true);
if (find != null) {
if (NO_SUCH_METHOD_NAME.equals(fallBack)) {
link = expression.noSuchMethod(desc, request);
link = expression.noSuchMethod(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
} else if (NO_SUCH_PROPERTY_NAME.equals(fallBack)) {
link = expression.noSuchProperty(desc, request);
link = expression.noSuchProperty(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
}
}
}