--- 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);
}
/**
--- 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
*/