test/langtools/tools/lib/toolbox/ToolBox.java

*** 849,27 ***
          /**
           * Maps binary class names to generated content.
           */
          private final Map<Location, Map<String, Content>> files;
  
          /**
           * Constructs a memory file manager which stores output files in memory,
           * and delegates to a default file manager for input files.
           */
          public MemoryFileManager() {
!             this(ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null));
          }
  
          /**
           * Constructs a memory file manager which stores output files in memory,
           * and delegates to a specified file manager for input files.
           *
           * @param fileManager the file manager to be used for input files
           */
!         public MemoryFileManager(JavaFileManager fileManager) {
              super(fileManager);
!             files = new HashMap<>();
          }
  
          @Override
          public JavaFileObject getJavaFileForOutput(Location location,
                                                     String name,
--- 849,43 ---
          /**
           * Maps binary class names to generated content.
           */
          private final Map<Location, Map<String, Content>> files;
  
+         /**
+          * Whether the delegate is owned by this instance and should be closed when
+          * this instance is closed.
+          */
+         private final boolean shouldClose;
+ 
          /**
           * Constructs a memory file manager which stores output files in memory,
           * and delegates to a default file manager for input files.
           */
          public MemoryFileManager() {
!             this(ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null), true);
          }
  
          /**
           * Constructs a memory file manager which stores output files in memory,
           * and delegates to a specified file manager for input files.
           *
           * @param fileManager the file manager to be used for input files
+          * @param shouldClose whether the delegate file manager should be closed
+          *     when this instance is closed
           */
!         public MemoryFileManager(JavaFileManager fileManager, boolean shouldClose) {
              super(fileManager);
!             this.files = new HashMap<>();
+             this.shouldClose = shouldClose;
+         }
+ 
+         @Override
+         public void close() throws IOException {
+             if (shouldClose) {
+                 super.close();
+             }
          }
  
          @Override
          public JavaFileObject getJavaFileForOutput(Location location,
                                                     String name,