commit dc857b3f0785e15d48500a4f45cea804612ad3a0
author Liam Miller-Cushon <cushon@google.com> Wed Mar 01 08:18:37 2017 +0000
committer Yue Gan <yueg@google.com> Wed Mar 01 12:35:58 2017 +0000
tree 6ed75b24085b04b20fd05b92983ec651193a1296
parent b869e584641521dc063f0589d7ce6a850ffc0b61

Don't leak file managers

--
PiperOrigin-RevId: 148860690
MOS_MIGRATED_REVID=148860690

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
index 6666e08..ad55b68 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
@@ -83,23 +83,22 @@
     Listener diagnostics = new Listener(context);
     BlazeJavaCompiler compiler;
 
-    JavacFileManager fileManager = new ClassloaderMaskingFileManager();
-    JavacTask task =
-        JavacTool.create()
-            .getTask(
-                errWriter,
-                fileManager,
-                diagnostics,
-                javacArguments,
-                ImmutableList.of() /*classes*/,
-                fileManager.getJavaFileObjectsFromPaths(arguments.sourceFiles()),
-                context);
-    if (arguments.processors() != null) {
-      task.setProcessors(arguments.processors());
-    }
-    fileManager.setContext(context);
-    setLocations(fileManager, arguments);
-    try {
+    try (JavacFileManager fileManager = new ClassloaderMaskingFileManager()) {
+      JavacTask task =
+          JavacTool.create()
+              .getTask(
+                  errWriter,
+                  fileManager,
+                  diagnostics,
+                  javacArguments,
+                  ImmutableList.of() /*classes*/,
+                  fileManager.getJavaFileObjectsFromPaths(arguments.sourceFiles()),
+                  context);
+      if (arguments.processors() != null) {
+        task.setProcessors(arguments.processors());
+      }
+      fileManager.setContext(context);
+      setLocations(fileManager, arguments);
       try {
         ok = task.call();
       } catch (PropagatedException e) {