8195589: T6587786.java failed after JDK-8189997

Reviewed-by: iris, vromero

Author: jonathan-gibbons

test/langtools/ProblemList.txt

@@ -55,7 +55,6 @@ tools/javac/modules/SourceInSymlinkTest.java
 # javap
 
 tools/javap/output/RepeatingTypeAnnotations.java                                8057687    generic-all    emit correct byte code an attributes for type annotations
-tools/javap/T6587786.java                                                       8195589    generic-all    T6587786.java failed after JDK-8189997
 
 ###########################################################################
 #

test/langtools/tools/javap/T6587786.java

@@ -36,18 +36,21 @@ public static void main(String[] args) throws Exception {
     }
 
     public void run() throws IOException {
-        javap("com.sun.javadoc.Doc", "com.sun.crypto.provider.ai");
-        javap("com.sun.crypto.provider.ai", "com.sun.javadoc.ClassDoc");
+        javap("jdk.javadoc.doclet.Doclet", "java.util.List");
+        javap("java.util.List", "jdk.javadoc.doclet.StandardDoclet");
     }
 
     void javap(String... args) {
         StringWriter sw = new StringWriter();
         PrintWriter out = new PrintWriter(sw);
         //sun.tools.javap.Main.entry(args);
-        int rc = com.sun.tools.javap.Main.run(args, out);
-        if (rc != 0)
-            throw new Error("javap failed. rc=" + rc);
-        out.close();
-        System.out.println(sw.toString());
+        try {
+            int rc = com.sun.tools.javap.Main.run(args, out);
+            if (rc != 0)
+                throw new Error("javap failed. rc=" + rc);
+        } finally {
+            out.close();
+            System.out.println(sw.toString());
+        }
     }
 }