8026756: Test java/util/zip/GZIP/GZIPInZip.java failed

Reviewed-by: alanb

test/java/util/zip/GZIP/GZIPInZip.java

@@ -22,15 +22,14 @@
  */
 
 /* @test
- * @bug 7021870 8023431
+ * @bug 7021870 8023431 8026756
  * @summary Reading last gzip chain member must not close the input stream.
  *          Garbage following gzip entry must be ignored.
  */
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
@@ -40,9 +39,9 @@ import java.util.zip.ZipOutputStream;
 
 public class GZIPInZip {
 
-    private static volatile Throwable trouble;
+    public static void main(String[] args)
+            throws Throwable {
 
-    public static void main(String[] args) throws Throwable {
         doTest(false, false);
         doTest(false, true);
         doTest(true, false);
@@ -53,63 +52,46 @@ public class GZIPInZip {
                                final boolean limitGISBuff)
             throws Throwable {
 
-        final PipedOutputStream pos = new PipedOutputStream();
-        final PipedInputStream pis = new PipedInputStream(pos);
+        byte[] buf;
+
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+             ZipOutputStream zos = new ZipOutputStream(baos)) {
 
-        Thread compressor = new Thread() {
-            public void run() {
             final byte[] xbuf = { 'x' };
-                try (ZipOutputStream zos = new ZipOutputStream(pos)) {
 
             zos.putNextEntry(new ZipEntry("a.gz"));
-                    try (GZIPOutputStream gos1 = new GZIPOutputStream(zos)) {
+            GZIPOutputStream gos1 = new GZIPOutputStream(zos);
             gos1.write(xbuf);
             gos1.finish();
-                    }
             if (appendGarbage)
                 zos.write(xbuf);
-
             zos.closeEntry();
 
             zos.putNextEntry(new ZipEntry("b.gz"));
-                    try (GZIPOutputStream gos2 = new GZIPOutputStream(zos)) {
+            GZIPOutputStream gos2 = new GZIPOutputStream(zos);
             gos2.write(xbuf);
             gos2.finish();
-                    }
             zos.closeEntry();
 
-                } catch (Throwable t) {
-                    trouble = t;
-                }
+            zos.flush();
+            buf = baos.toByteArray();
         }
-        };
 
-        Thread uncompressor = new Thread() {
-            public void run() {
-                try (ZipInputStream zis = new ZipInputStream(pis)) {
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(buf);
+             ZipInputStream zis = new ZipInputStream(bais)) {
+
             zis.getNextEntry();
-                    try (InputStream gis = limitGISBuff ?
+            GZIPInputStream gis1 = limitGISBuff ?
                     new GZIPInputStream(zis, 4) :
-                            new GZIPInputStream(zis)) {
+                    new GZIPInputStream(zis);
             // try to read more than the entry has
-                        gis.skip(2);
-                    }
+            gis1.skip(2);
 
             try {
                 zis.getNextEntry();
             } catch (IOException e) {
-                        throw new AssertionError("ZIP stream was prematurely closed");
-                    }
-                } catch (Throwable t) {
-                    trouble = t;
+                throw new RuntimeException("ZIP stream was prematurely closed", e);
             }
         }
-        };
-
-        compressor.start(); uncompressor.start();
-        compressor.join();  uncompressor.join();
-
-        if (trouble != null)
-            throw trouble;
     }
 }