--- a/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Wed Oct 29 12:09:17 2014 +0100
+++ b/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Wed Oct 29 17:25:23 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -90,24 +90,25 @@
     public static void main(String... args) throws Exception {
         //create default shared JavaCompiler - reused across multiple compilations
         JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
-        StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
+        try (StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null)) {
 
-        for (PackageKind pk : PackageKind.values()) {
-            for (ImportKind ik : ImportKind.values()) {
-                for (ModifierKind mk1 : ModifierKind.values()) {
-                    for (ModifierKind mk2 : ModifierKind.values()) {
-                        for (ToplevelDocKind tdk : ToplevelDocKind.values()) {
-                            new DocCommentToplevelTest(pk, ik, mk1, mk2, tdk).run(comp, fm);
+            for (PackageKind pk : PackageKind.values()) {
+                for (ImportKind ik : ImportKind.values()) {
+                    for (ModifierKind mk1 : ModifierKind.values()) {
+                        for (ModifierKind mk2 : ModifierKind.values()) {
+                            for (ToplevelDocKind tdk : ToplevelDocKind.values()) {
+                                new DocCommentToplevelTest(pk, ik, mk1, mk2, tdk).run(comp, fm);
+                            }
                         }
                     }
                 }
             }
-        }
 
-        if (errors > 0)
-            throw new AssertionError(errors + " errors found");
+            if (errors > 0)
+                throw new AssertionError(errors + " errors found");
 
-        System.out.println(checks + " checks were made");
+            System.out.println(checks + " checks were made");
+        }
     }
 
     PackageKind pk;