--- a/langtools/test/tools/javac/T6410706.java	Wed Oct 29 12:09:17 2014 +0100
+++ b/langtools/test/tools/javac/T6410706.java	Wed Oct 29 17:25:23 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -44,21 +44,22 @@
         String testClasses = System.getProperty("test.classes", ".");
         JavacTool tool = JavacTool.create();
         MyDiagListener dl = new MyDiagListener();
-        StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
-        fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(testClasses)));
-        Iterable<? extends JavaFileObject> files =
-            fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, T6410706.class.getName()+".java")));
-        JavacTask task = tool.getTask(null, fm, dl, null, null, files);
-        task.parse();
-        task.analyze();
-        task.generate();
+        try (StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null)) {
+            fm.setLocation(StandardLocation.CLASS_OUTPUT, Arrays.asList(new File(testClasses)));
+            Iterable<? extends JavaFileObject> files =
+                fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, T6410706.class.getName()+".java")));
+            JavacTask task = tool.getTask(null, fm, dl, null, null, files);
+            task.parse();
+            task.analyze();
+            task.generate();
 
-        // expect 2 notes:
-        // Note: T6410706.java uses or overrides a deprecated API.
-        // Note: Recompile with -Xlint:deprecation for details.
+            // expect 2 notes:
+            // Note: T6410706.java uses or overrides a deprecated API.
+            // Note: Recompile with -Xlint:deprecation for details.
 
-        if (dl.notes != 2)
-            throw new AssertionError(dl.notes + " notes given");
+            if (dl.notes != 2)
+                throw new AssertionError(dl.notes + " notes given");
+        }
     }
 
     private static class MyDiagListener implements DiagnosticListener<JavaFileObject>