From 818b4699cfd18dda066e10be1a530d848980dbc3 Mon Sep 17 00:00:00 2001 From: Jurriaan Mous Date: Sun, 8 May 2016 08:43:28 +0200 Subject: [PATCH] HBASE-15797 TestIPCUtil fails after HBASE-15795 --- .../src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java index a87bc8d..74466b5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java @@ -139,16 +139,16 @@ public class IPCUtil { baos = new ByteBufferOutputStream(bufferSize); } Compressor poolCompressor = null; - try (OutputStream os = baos) { - OutputStream os2Compress = os; + OutputStream os = baos; + try { if (compressor != null) { if (compressor instanceof Configurable) { ((Configurable) compressor).setConf(this.conf); } poolCompressor = CodecPool.getCompressor(compressor); - os2Compress = compressor.createOutputStream(os, poolCompressor); + os = compressor.createOutputStream(os, poolCompressor); } - Codec.Encoder encoder = codec.getEncoder(os2Compress); + Codec.Encoder encoder = codec.getEncoder(os); int count = 0; while (cellScanner.advance()) { encoder.write(cellScanner.current()); @@ -163,6 +163,8 @@ public class IPCUtil { } catch (BufferOverflowException e) { throw new DoNotRetryIOException(e); } finally { + os.close(); + if (poolCompressor != null) { CodecPool.returnCompressor(poolCompressor); } -- 2.6.4 (Apple Git-63)