src/jdk/nashorn/api/scripting/NashornScriptEngine.java

Print this page
rev 1199 : 8072595: nashorn should not use obj.getClass() for null checks
Reviewed-by: hannesw, attila

*** 37,46 **** --- 37,47 ---- import java.security.Permissions; import java.security.PrivilegedAction; import java.security.ProtectionDomain; import java.text.MessageFormat; import java.util.Locale; + import java.util.Objects; import java.util.ResourceBundle; import javax.script.AbstractScriptEngine; import javax.script.Bindings; import javax.script.Compilable; import javax.script.CompiledScript;
*** 358,368 **** return newGlobal; } private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException { ! name.getClass(); // null check assert !(selfObject instanceof ScriptObject) : "raw ScriptObject not expected here"; Global invokeGlobal = null; ScriptObjectMirror selfMirror = null; if (selfObject instanceof ScriptObjectMirror) { --- 359,369 ---- return newGlobal; } private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException { ! Objects.requireNonNull(name); assert !(selfObject instanceof ScriptObject) : "raw ScriptObject not expected here"; Global invokeGlobal = null; ScriptObjectMirror selfMirror = null; if (selfObject instanceof ScriptObjectMirror) {