tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-04-08 19:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make close() idempotent (fixes #107).

Browse Source
This commit is contained in:
Josh Rosen 2015-05-14 00:28:38 -07:00
parent c5a3b102bc
commit 2b6c8dc896
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/xerial/snappy/SnappyOutputStream.java
View File

@ -69,6 +69,7 @@ public class SnappyOutputStream extends OutputStream {
protected final byte[] outputBuffer; protected final byte[] outputBuffer;
private int inputCursor = 0; private int inputCursor = 0;
private int outputCursor = 0; private int outputCursor = 0;
private boolean closed;
public SnappyOutputStream(OutputStream out) { public SnappyOutputStream(OutputStream out) {
this(out, DEFAULT_BLOCK_SIZE); this(out, DEFAULT_BLOCK_SIZE);
@ -320,10 +321,14 @@ public class SnappyOutputStream extends OutputStream {
*/ */
@Override @Override
public void close() throws IOException { public void close() throws IOException {
if (closed) {
return;
}
try { try {
flush(); flush();
out.close(); out.close();
} finally { } finally {
closed = true;
inputBufferAllocator.release(inputBuffer); inputBufferAllocator.release(inputBuffer);
outputBufferAllocator.release(outputBuffer); outputBufferAllocator.release(outputBuffer);
} }

2
src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
View File

@ -187,8 +187,10 @@ public class SnappyOutputStreamTest
os3.close(); os3.close();
SnappyInputStream in2 = new SnappyInputStream(new ByteArrayInputStream(ba2.toByteArray())); SnappyInputStream in2 = new SnappyInputStream(new ByteArrayInputStream(ba2.toByteArray()));
assertEquals(2, in2.read()); assertEquals(2, in2.read());
in2.close();
SnappyInputStream in3 = new SnappyInputStream(new ByteArrayInputStream(ba3.toByteArray())); SnappyInputStream in3 = new SnappyInputStream(new ByteArrayInputStream(ba3.toByteArray()));
assertEquals(3, in3.read()); assertEquals(3, in3.read());
in3.close();
} }
@Test @Test