# HG changeset patch
# User tbell
# Date 1256933544 25200
# Node ID 0c0afcd9a329f66131eb60c8a09a99ae09f67277
# Parent  0800b2aa9c52e0602820d14ddd2e2fde7a50636f# Parent  61284fdd478f50a55403a5abded8753c065932e0
Merge

diff -r 0800b2aa9c52 -r 0c0afcd9a329 jdk/src/share/classes/java/util/zip/Deflater.java
--- a/jdk/src/share/classes/java/util/zip/Deflater.java	Fri Oct 30 09:06:38 2009 -0700
+++ b/jdk/src/share/classes/java/util/zip/Deflater.java	Fri Oct 30 13:12:24 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 0800b2aa9c52 -r 0c0afcd9a329 jdk/test/java/util/zip/Bounds.java
--- a/jdk/test/java/util/zip/Bounds.java	Fri Oct 30 09:06:38 2009 -0700
+++ b/jdk/test/java/util/zip/Bounds.java	Fri Oct 30 13:12:24 2009 -0700
@@ -22,8 +22,7 @@
  */
 
 /* @test
- * @bug 4811913
- * @ignore until 6896424 is resolved
+ * @bug 4811913 6894950
  * @summary Test bounds checking in zip package
  */