Merge

a191879b · tbell · 4b54a5bb · 03171c61 · a191879b · a191879b
显示空白变更内容
内联并排

Showing with 2 addition and 3 deletion

src/share/classes/java/util/zip/Deflater.java src/share/classes/java/util/zip/Deflater.java +1 -1

test/java/util/zip/Bounds.java test/java/util/zip/Bounds.java +1 -2

未找到文件。
--- a/src/share/classes/java/util/zip/Deflater.java
+++ b/src/share/classes/java/util/zip/Deflater.java
@@ -333,7 +333,7 @@ class Deflater {
     *         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/test/java/util/zip/Bounds.java
+++ b/test/java/util/zip/Bounds.java
@@ -22,8 +22,7 @@
 */

 /* @test
- * @bug 4811913
- * @ignore until 6896424 is resolved
+ * @bug 4811913 6894950
 * @summary Test bounds checking in zip package
 */