Author: bodewig
Date: Wed Aug 3 13:36:01 2011
New Revision: 1153483
URL: http://svn.apache.org/viewvc?rev=1153483&view=rev
Log:
finalize deflater and inflater instances in ZIP streams. COMPRESS-152
Modified:
commons/proper/compress/trunk/src/changes/changes.xml
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1153483&r1=1153482&r2=1153483&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Wed Aug 3 13:36:01
2011
@@ -46,6 +46,10 @@ The <action> type attribute can be add,u
<body>
<release version="1.3" date="unreleased"
description="Release 1.3 - API compatible to 1.2 but requires
Java5 at runtime">
+ <action issue="COMPRESS-152" type="fix" date="2011-08-03">
+ ZipArchiveInputStream and ZipArchiveOutputStream could leak
+ resources on some JDKs.
+ </action>
</release>
<release version="1.2" date="2011-07-31"
description="Release 1.2 - a bugfix release, the last release
expected to be compatible with Java 1.4">
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=1153483&r1=1153482&r2=1153483&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Wed Aug 3 13:36:01 2011
@@ -364,6 +364,7 @@ public class ZipArchiveInputStream exten
if (!closed) {
closed = true;
in.close();
+ inf.end();
}
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1153483&r1=1153482&r2=1153483&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Wed Aug 3 13:36:01 2011
@@ -357,6 +357,7 @@ public class ZipArchiveOutputStream exte
writeCentralDirectoryEnd();
offsets.clear();
entries.clear();
+ def.end();
finished = true;
}