8293591: Remove use of Thread.stop from jshell tests

lahodaj · lahodaj · commit fbd8b42d70f4 · 2022-09-15T11:27:15.000Z
Reviewed-by: alanb
diff --git a/test/langtools/jdk/jshell/UITesting.java b/test/langtools/jdk/jshell/UITesting.java
@@ -120,12 +120,9 @@ public void write(String str) throws IOException {
             waitOutput(out, PROMPT);
             test.test(inputSink, out);
         } finally {
-            inputSink.write(INTERRUPT + INTERRUPT + "/exit");
+            inputSink.write(INTERRUPT + INTERRUPT + "/exit\n");
 
-            runner.join(1000);
-            if (runner.isAlive()) {
-                runner.stop();
-            }
+            runner.join();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,9 @@ public void write(String str) throws IOException {`
`120`	`120`	`waitOutput(out, PROMPT);`
`121`	`121`	`test.test(inputSink, out);`
`122`	`122`	`} finally {`
`123`		`- inputSink.write(INTERRUPT + INTERRUPT + "/exit");`
	`123`	`+ inputSink.write(INTERRUPT + INTERRUPT + "/exit\n");`
`124`	`124`
`125`		`- runner.join(1000);`
`126`		`- if (runner.isAlive()) {`
`127`		`- runner.stop();`
`128`		`- }`
	`125`	`+ runner.join();`
`129`	`126`	`}`
`130`	`127`	`}`
`131`	`128`