changeset 35975:6ed1de57b086

Merge
author amurillo
date Mon, 15 Feb 2016 13:37:22 -0800
parents 5d40126ca3c2 c4c9ee2cb926
children 9fdca6a099c1
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/java/util/zip/ConstructDeflaterInput.java	Mon Feb 15 09:44:42 2016 -0800
+++ b/jdk/test/java/util/zip/ConstructDeflaterInput.java	Mon Feb 15 13:37:22 2016 -0800
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 4679743
+ * @bug 4679743 8148624
  * @summary Test parts of DeflaterInputStream code that don't really do I/O.
  */
 
@@ -41,10 +41,10 @@
         }
     }
 
+    private static MyDeflater def = new MyDeflater();
     public static void realMain(String[] args) throws Throwable {
         ByteArrayInputStream bais = new ByteArrayInputStream(
             "hello, world".getBytes());
-        MyDeflater def = new MyDeflater();
         DeflaterInputStream dis = null;
         byte[] b = new byte[512];
 
--- a/jdk/test/java/util/zip/ConstructInflaterOutput.java	Mon Feb 15 09:44:42 2016 -0800
+++ b/jdk/test/java/util/zip/ConstructInflaterOutput.java	Mon Feb 15 13:37:22 2016 -0800
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 4679743
+ * @bug 4679743 8148624
  * @summary Test parts of InflaterOutputStream code that don't really do I/O.
  */
 
@@ -41,9 +41,10 @@
         }
     }
 
+    private static MyInflater inf = new MyInflater();
+
     public static void realMain(String[] args) throws Throwable {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        MyInflater inf = new MyInflater();
         InflaterOutputStream ios = null;
         byte[] b = new byte[512];