aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle J Stiemann <stiemannkj1@gmail.com>2023-02-03 16:58:42 -0800
committergoogle-java-format Team <google-java-format-dev+copybara@google.com>2023-02-03 16:59:22 -0800
commit91223aa642bd64f973e5b147a7e7d93a2b454fe5 (patch)
tree90082f59d5fe2ff45fb06b41c99995297fb9f5c4
parent4a22aab7b19a41d6267ea70c76f137a6fd49bc76 (diff)
downloadgoogle-java-format-91223aa642bd64f973e5b147a7e7d93a2b454fe5.tar.gz
Fix #846 Formatter leaks threads and memory
I've signed the CLA. Fixes #847 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/google-java-format/pull/847 from stiemannkj1:fix-846-mem-thread-leak 0ca1e9bf9c8cf877509ac39cc50707d0ade7d71c PiperOrigin-RevId: 507026969
-rw-r--r--core/src/main/java/com/google/googlejavaformat/java/Main.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/java/com/google/googlejavaformat/java/Main.java b/core/src/main/java/com/google/googlejavaformat/java/Main.java
index 11c0192..628c8bb 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/Main.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/Main.java
@@ -18,6 +18,7 @@ import static java.lang.Math.min;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.io.ByteStreams;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.googlejavaformat.FormatterDiagnostic;
import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
import java.io.IOError;
@@ -28,6 +29,7 @@ import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.time.Duration;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -187,6 +189,10 @@ public final class Main {
outWriter.write(formatted);
}
}
+ if (!MoreExecutors.shutdownAndAwaitTermination(executorService, Duration.ofSeconds(5))) {
+ errWriter.println("Failed to shut down ExecutorService");
+ allOk = false;
+ }
return allOk ? 0 : 1;
}