/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.mozilla.javascript.engine;

import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import javax.script.Bindings;

/**
 * This class makes the Bindings object into a Scriptable. That way, we can query and modify
 * the contents of the Bindings on demand.
 */
public class BindingsObject
  extends ScriptableObject {
  private final Bindings bindings;

  BindingsObject(Bindings bindings) {
    if (bindings == null) {
      throw new IllegalArgumentException("Bindings must not be null");
    }
    this.bindings = bindings;
  }

  @Override
  public String getClassName() {
    return "BindingsObject";
  }

  @Override
  public Object get(String name, Scriptable start) {
    Object ret = bindings.get(name);
    if (ret == null) {
      return Scriptable.NOT_FOUND;
    }
    return Context.jsToJava(ret, Object.class);
  }

  @Override
  public void put(String name, Scriptable start, Object value) {
    bindings.put(name, Context.javaToJS(value, start));
  }

  @Override
  public void delete(String name) {
    bindings.remove(name);
  }

  @Override
  public boolean has(String name, Scriptable start) {
    return bindings.containsKey(name);
  }

  @Override
  public Object[] getIds() {
    return bindings.keySet().toArray();
  }
}

@@ -966,60 +966,39 @@
     
-Object ret = bindings.get(name);%0A    if (ret == null
+if (!bindings.containsKey(name)
 ) %7B%0A
@@ -1066,19 +1066,34 @@
 sToJava(
-ret
+bindings.get(name)
 , Object

Fix the variable which has been defined null can not found, in script engine.Changed the if condition from null-checking to Map::containsKey.