From 8f7a8dabc1ce6740fd73b891abd788a09f270d2d Mon Sep 17 00:00:00 2001 From: kimchy Date: Fri, 29 Oct 2010 17:50:51 +0200 Subject: [PATCH] only flush if there is something to flush --- .idea/runConfigurations/ElasticSearch_Tests__compress_.xml | 2 ++ .../elasticsearch/common/compress/lzf/LZFOutputStream.java | 6 ++++-- .../org/elasticsearch/common/io/stream/LZFStreamOutput.java | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.idea/runConfigurations/ElasticSearch_Tests__compress_.xml b/.idea/runConfigurations/ElasticSearch_Tests__compress_.xml index 0ee2787cf4a..d498d2fb5e0 100644 --- a/.idea/runConfigurations/ElasticSearch_Tests__compress_.xml +++ b/.idea/runConfigurations/ElasticSearch_Tests__compress_.xml @@ -34,7 +34,9 @@ + + \ No newline at end of file diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFOutputStream.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFOutputStream.java index e20b6bb5abc..e6bbc2f7261 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFOutputStream.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/common/compress/lzf/LZFOutputStream.java @@ -82,7 +82,9 @@ public class LZFOutputStream extends OutputStream { * Compress and write the current block to the OutputStream */ private void writeCompressedBlock() throws IOException { - encoder.encodeChunk(outputStream, outputBuffer, 0, position); - position = 0; + if (position > 0) { + encoder.encodeChunk(outputStream, outputBuffer, 0, position); + position = 0; + } } } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java index d5718a98de6..980d4eb2afa 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/common/io/stream/LZFStreamOutput.java @@ -103,7 +103,9 @@ public class LZFStreamOutput extends StreamOutput { * Compress and write the current block to the OutputStream */ private void writeCompressedBlock() throws IOException { - encoder.encodeChunk(out, outputBuffer, 0, position); - position = 0; + if (position > 0) { + encoder.encodeChunk(out, outputBuffer, 0, position); + position = 0; + } } }