# HG changeset patch
# User sherman
# Date 1256932876 25200
# Node ID 61284fdd478f50a55403a5abded8753c065932e0
# Parent  208f8c11e7ba531b9d8f60a37376731141048524
6894950: test/java/util/zip/Bounds.java fails with OoutOfMemoryError
Summary: Fixed the boundary check in Deflater.java
Reviewed-by: alanb

diff -r 208f8c11e7ba -r 61284fdd478f jdk/src/share/classes/java/util/zip/Deflater.java
--- a/jdk/src/share/classes/java/util/zip/Deflater.java	Fri Oct 30 15:06:24 2009 +0000
+++ b/jdk/src/share/classes/java/util/zip/Deflater.java	Fri Oct 30 13:01:16 2009 -0700
@@ -333,7 +333,7 @@
      *         output buffer
      */
     public int deflate(byte[] b, int off, int len) {
-        return deflateBytes(b, off, len, NO_FLUSH);
+        return deflate(b, off, len, NO_FLUSH);
     }
 
     /**
diff -r 208f8c11e7ba -r 61284fdd478f jdk/test/java/util/zip/Bounds.java
--- a/jdk/test/java/util/zip/Bounds.java	Fri Oct 30 15:06:24 2009 +0000
+++ b/jdk/test/java/util/zip/Bounds.java	Fri Oct 30 13:01:16 2009 -0700
@@ -22,8 +22,7 @@
  */
 
 /* @test
- * @bug 4811913
- * @ignore until 6896424 is resolved
+ * @bug 4811913 6894950
  * @summary Test bounds checking in zip package
  */