From d5b1f00369d64600aafce3ea56e7c4175e93e3f0 Mon Sep 17 00:00:00 2001
From: Matthew Hague <matthew.hague@rhul.ac.uk>
Date: Mon, 9 Nov 2020 19:59:39 +0000
Subject: [PATCH] Make SubmissionWrapper.close kill if necessary
---
.../java/uk/ac/rhul/cs/javatester/SubmissionWrapper.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/uk/ac/rhul/cs/javatester/SubmissionWrapper.java b/src/main/java/uk/ac/rhul/cs/javatester/SubmissionWrapper.java
index a1609af..f40e763 100644
--- a/src/main/java/uk/ac/rhul/cs/javatester/SubmissionWrapper.java
+++ b/src/main/java/uk/ac/rhul/cs/javatester/SubmissionWrapper.java
@@ -174,6 +174,8 @@ public class SubmissionWrapper implements AutoCloseable {
* Close the streams and kill the submission
*/
public void close() {
+ waitFor();
+
flushOutputStreams();
try {
@@ -527,6 +529,9 @@ public class SubmissionWrapper implements AutoCloseable {
try {
process.waitFor(TIMEOUT, TimeUnit.SECONDS);
} catch (InterruptedException e) {
+ // no nothing
+ } finally {
+ // make sure it's really shutdown
process.destroyForcibly();
}
}
--
GitLab