From 7d2c3a1c0f43f4dfebbd85eb395646eb8e46a48d Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 6 Feb 2009 16:29:39 +0000 Subject: [PATCH] provide a finish method separate from close - merge from commons-compress, this time merging the correct revision git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@741618 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/bzip2/CBZip2OutputStream.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java index ae2e9ac70..ac2f510b3 100644 --- a/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java +++ b/src/main/org/apache/tools/bzip2/CBZip2OutputStream.java @@ -381,6 +381,16 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants { if (closed) { return; } + finish(); + super.close(); + bsStream.close(); + closed = true; + } + + protected void finish() throws IOException { + if (closed) { + return; + } if (runLength > 0) { writeRun(); @@ -388,9 +398,6 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants { currentChar = -1; endBlock(); endCompression(); - closed = true; - super.close(); - bsStream.close(); } public void flush() throws IOException {