--- a/langtools/test/tools/javac/api/8007344/Test.java	Wed Oct 29 12:09:17 2014 +0100
+++ b/langtools/test/tools/javac/api/8007344/Test.java	Wed Oct 29 17:25:23 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,14 +83,15 @@
         File testSrc = new File(System.getProperty("test.src"));
         File thisFile = new File(testSrc, getClass().getName() + ".java");
         JavacTool javac = JavacTool.create();
-        StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null);
-        fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(".")));
-        Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjects(thisFile);
-        testAnnoProcessor(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
-        testTaskListener(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
+        try (StandardJavaFileManager fm = javac.getStandardFileManager(null, null, null)) {
+            fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(".")));
+            Iterable<? extends JavaFileObject> fos = fm.getJavaFileObjects(thisFile);
+            testAnnoProcessor(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
+            testTaskListener(javac, fm, fos, out, EXPECT_DOC_COMMENTS);
 
-        if (errors > 0)
-            throw new Exception(errors + " errors occurred");
+            if (errors > 0)
+                throw new Exception(errors + " errors occurred");
+        }
     }
 
     void testAnnoProcessor(JavacTool javac, StandardJavaFileManager fm,