--- old/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java	2015-08-23 09:53:41.987515100 +0530
+++ new/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/EditObject.java	2015-08-23 09:53:41.128468200 +0530
@@ -25,6 +25,9 @@
 
 package jdk.nashorn.tools.jjs;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Consumer;
 import jdk.nashorn.api.scripting.AbstractJSObject;
 import jdk.nashorn.internal.runtime.JSType;
@@ -35,6 +38,13 @@
  * for editing and evaluating scripts from it.
  */
 final class EditObject extends AbstractJSObject {
+    private static final Set<String> props;
+    static {
+        final HashSet<String> s = new HashSet<>();
+        s.add("editor");
+        props = Collections.unmodifiableSet(s);
+    }
+
     private final Consumer<String> errorHandler;
     private final Consumer<String> evaluator;
     private final Console console;
@@ -61,6 +71,11 @@
     }
 
     @Override
+    public Set<String> keySet() {
+        return props;
+    }
+
+    @Override
     public Object getMember(final String name) {
         if (name.equals("editor")) {
             return editor;