--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java Tue Jul 19 11:27:56 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java Wed Jul 20 23:19:09 2016 -0700
@@ -223,7 +223,6 @@
new WrapSourceHandler(),
Util.join(new String[] {
"-Xshouldstop:at=FLOW", "-Xlint:unchecked",
- "-XaddExports:jdk.jshell/jdk.internal.jshell.remote=ALL-UNNAMED",
"-proc:none"
}, extraArgs));
}
@@ -267,7 +266,7 @@
CompileTask(final Collection<OuterWrap> wraps) {
super(wraps.stream(), new WrapSourceHandler(),
- "-Xlint:unchecked", "-XaddExports:jdk.jshell/jdk.internal.jshell.remote=ALL-UNNAMED", "-proc:none", "-parameters");
+ "-Xlint:unchecked", "-proc:none", "-parameters");
}
boolean compile() {
@@ -286,7 +285,7 @@
}
List<String> list = new ArrayList<>();
for (OutputMemoryJavaFileObject fo : l) {
- state.setClassnameToBytes(fo.getName(), fo.getBytes());
+ state.classTracker.setCurrentBytes(fo.getName(), fo.getBytes());
list.add(fo.getName());
}
return list;