Author: bodewig
Date: Thu Aug 18 13:55:11 2011
New Revision: 1159218
URL: http://svn.apache.org/viewvc?rev=1159218&view=rev
Log:
ensure DumpArchiveInputStream closes underlying stream. COMPRESS-132
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java?rev=1159218&r1=1159217&r2=1159218&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStream.java
Thu Aug 18 13:55:11 2011
@@ -234,6 +234,7 @@ public class DumpArchiveInputStream exte
// check if this is an end-of-volume marker.
if (DumpArchiveConstants.SEGMENT_TYPE.END ==
active.getHeaderType()) {
hasHitEOF = true;
+ isClosed = true;
raw.close();
return null;
@@ -267,8 +268,6 @@ public class DumpArchiveInputStream exte
entry.setSimpleName(names.get(entry.getIno()).getName());
entry.setOffset(filepos);
- isClosed = false;
-
return entry;
}
@@ -478,7 +477,10 @@ public class DumpArchiveInputStream exte
*/
@Override
public void close() throws IOException {
- isClosed = true;
+ if (!isClosed) {
+ isClosed = true;
+ raw.close();
+ }
}
/**