From bdaaed3393bf97e51a49aed5334a3c8635d83652 Mon Sep 17 00:00:00 2001
From: bristor <unknown>
Date: Mon, 8 Sep 2008 13:44:32 -0700
Subject: [PATCH] 6661861: Decrease memory use of Inflaters by ZipFile Summary:
 Fix allows release of native resources earlier than without fix Reviewed-by:
 alanb

---
 src/share/classes/java/util/zip/Inflater.java | 7 +++++--
 src/share/classes/java/util/zip/ZipFile.java  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/share/classes/java/util/zip/Inflater.java b/src/share/classes/java/util/zip/Inflater.java
index bc0bdf55f..68c8d6233 100644
--- a/src/share/classes/java/util/zip/Inflater.java
+++ b/src/share/classes/java/util/zip/Inflater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,11 +73,13 @@ package java.util.zip;
 public
 class Inflater {
     private long strm;
-    private byte[] buf = new byte[0];
+    private byte[] buf = defaultBuf;
     private int off, len;
     private boolean finished;
     private boolean needDict;
 
+    private static final byte[] defaultBuf = new byte[0];
+
     static {
         /* Zip library is loaded from System.initializeSystemClass */
         initIDs();
@@ -318,6 +320,7 @@ class Inflater {
     public synchronized void reset() {
         ensureOpen();
         reset(strm);
+        buf = defaultBuf;
         finished = false;
         needDict = false;
         off = len = 0;
diff --git a/src/share/classes/java/util/zip/ZipFile.java b/src/share/classes/java/util/zip/ZipFile.java
index 8ad177fdc..37e92ddec 100644
--- a/src/share/classes/java/util/zip/ZipFile.java
+++ b/src/share/classes/java/util/zip/ZipFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -278,7 +278,6 @@ class ZipFile implements ZipConstants {
             int size = inflaters.size();
             if (size > 0) {
                 Inflater inf = (Inflater)inflaters.remove(size - 1);
-                inf.reset();
                 return inf;
             } else {
                 return new Inflater(true);
@@ -291,6 +290,7 @@ class ZipFile implements ZipConstants {
      */
     private void releaseInflater(Inflater inf) {
         synchronized (inflaters) {
+            inf.reset();
             inflaters.add(inf);
         }
     }
-- 
GitLab