Skip to content

Commit 91223aa

Browse files
stiemannkj1google-java-format Team
authored andcommitted
Fix #846 Formatter leaks threads and memory
I've signed the CLA. Fixes #847 COPYBARA_INTEGRATE_REVIEW=#847 from stiemannkj1:fix-846-mem-thread-leak 0ca1e9b PiperOrigin-RevId: 507026969
1 parent 4a22aab commit 91223aa

File tree

1 file changed

+6
-0
lines changed
  • core/src/main/java/com/google/googlejavaformat/java

1 file changed

+6
-0
lines changed

core/src/main/java/com/google/googlejavaformat/java/Main.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static java.nio.charset.StandardCharsets.UTF_8;
1919

2020
import com.google.common.io.ByteStreams;
21+
import com.google.common.util.concurrent.MoreExecutors;
2122
import com.google.googlejavaformat.FormatterDiagnostic;
2223
import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
2324
import java.io.IOError;
@@ -28,6 +29,7 @@
2829
import java.nio.file.Files;
2930
import java.nio.file.Path;
3031
import java.nio.file.Paths;
32+
import java.time.Duration;
3133
import java.util.Arrays;
3234
import java.util.LinkedHashMap;
3335
import java.util.Map;
@@ -187,6 +189,10 @@ private int formatFiles(CommandLineOptions parameters, JavaFormatterOptions opti
187189
outWriter.write(formatted);
188190
}
189191
}
192+
if (!MoreExecutors.shutdownAndAwaitTermination(executorService, Duration.ofSeconds(5))) {
193+
errWriter.println("Failed to shut down ExecutorService");
194+
allOk = false;
195+
}
190196
return allOk ? 0 : 1;
191197
}
192198

0 commit comments

Comments
 (0)