Don't leak file managers

-- PiperOrigin-RevId: 148860690 MOS_MIGRATED_REVID=148860690
sunxingxingtf · Mar 1, 2017 · dc857b3 · dc857b3
1 parent b869e58
commit dc857b3
Showing 1 changed file with 16 additions and 17 deletions.
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
@@ -83,23 +83,22 @@ public static BlazeJavacResult compile(BlazeJavacArguments arguments) {
     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) {