archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6879371: javap does not close internal default file manager

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2009-09-08 11:43:57 -07:00
parent a8e28960cd
commit b2645b9065
2 changed files with 136 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
View file

@ -455,8 +455,19 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
return EXIT_CMDERR;
}
boolean ok = run();
return ok ? EXIT_OK : EXIT_ERROR;
try {
boolean ok = run();
return ok ? EXIT_OK : EXIT_ERROR;
} finally {
if (defaultFileManager != null) {
try {
defaultFileManager.close();
defaultFileManager = null;
} catch (IOException e) {
throw new InternalError(e);
}
}
}
} catch (BadArgs e) {
reportError(e.key, e.args);
if (e.showUsage) {
@ -856,7 +867,9 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
}
private JavaFileManager getDefaultFileManager(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log) {
return JavapFileManager.create(dl, log);
if (defaultFileManager == null)
defaultFileManager = JavapFileManager.create(dl, log);
return defaultFileManager;
}
private JavaFileObject getClassFileObject(String className) throws IOException {
@ -1004,6 +1017,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
protected Context context;
JavaFileManager fileManager;
JavaFileManager defaultFileManager;
PrintWriter log;
DiagnosticListener<? super JavaFileObject> diagnosticListener;
List<String> classes;