--- a/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Wed Oct 29 12:09:17 2014 +0100
+++ b/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Wed Oct 29 17:25:23 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -250,13 +250,17 @@
     }
 
     public static void main(String[] args) throws Exception {
-        for(Context ct : Context.values()) {
-            for (FInterface fi : FInterface.values()) {
-                for (MethodDef md: MethodDef.values()) {
-                    new SamConversionComboTest(fi, ct, md).test();
+        try {
+            for(Context ct : Context.values()) {
+                for (FInterface fi : FInterface.values()) {
+                    for (MethodDef md: MethodDef.values()) {
+                        new SamConversionComboTest(fi, ct, md).test();
+                    }
                 }
             }
+            System.out.println("total tests: " + count);
+        } finally {
+            fm.close();
         }
-        System.out.println("total tests: " + count);
     }
 }