jdk-sandbox: comparison langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java

equal deleted inserted replaced

-:118221d3960d
+:7193f6ef25db
 } else {
 return s;
 }
 }
+/**
+* The entry point into the JShell tool.
+*
+* @param args the command-line arguments
+* @throws Exception catastrophic fatal exception
+*/
 public void start(String[] args) throws Exception {
 OptionParserCommandLine commandLineArgs = new OptionParserCommandLine();
 options = commandLineArgs.parse(args);
 if (options == null) {
 // Abort
 // if we haven't died, and the feedback mode wants fluff, print welcome
 if (feedback.shouldDisplayCommandFluff()) {
 hardmsg("jshell.msg.welcome", version());
 }
 // Be sure history is always saved so that user code isn't lost
-Runtime.getRuntime().addShutdownHook(new Thread() {
+Thread shutdownHook = new Thread() {
 @Override
 public void run() {
 replayableHistory.storeHistory(prefs);
 }
-});
+};
+Runtime.getRuntime().addShutdownHook(shutdownHook);
 // execute from user input
 try (IOContext in = new ConsoleIOContext(this, cmdin, console)) {
-start(in);
+while (regenerateOnDeath) {
-}
+if (!live) {
-}
+resetState();
 }
+run(in);
-private void start(IOContext in) {
+}
-try {
+} finally {
-while (regenerateOnDeath) {
+replayableHistory.storeHistory(prefs);
-if (!live) {
+closeState();
-resetState();
+try {
-}
+Runtime.getRuntime().removeShutdownHook(shutdownHook);
-run(in);
+} catch (Exception ex) {
-}
+// ignore, this probably caused by VM aready being shutdown
-} finally {
+// and this is the last act anyhow
-closeState();
+}
 }
+}
+closeState();
 }
 private EditorSetting configEditor() {
 // Read retained editor setting (if any)
 editor = EditorSetting.fromPrefs(prefs);
 private void closeState() {
 live = false;
 JShell oldState = state;
 if (oldState != null) {
+state = null;
+analysis = null;
 oldState.unsubscribe(shutdownSubscription); // No notification
 oldState.close();
 }
 }
 }
 private boolean cmdExit() {
 regenerateOnDeath = false;
 live = false;
-replayableHistory.storeHistory(prefs);
 fluffmsg("jshell.msg.goodbye");
 return true;
 }
 boolean cmdHelp(String arg) {

changeset 43757	7193f6ef25db
parent 43564	4287765963d5
child 43759	61535ac55add