From c94c13fa2612989da1537ed219da182c0eb57ab0 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 26 Aug 2014 14:04:59 -0700
Subject: [PATCH] Revert part of change in #7466 to fix issue because encoder
 is not threadsafe so cannot be shared

---
 .../common/compress/lzf/LZFCompressedStreamOutput.java       | 5 +++--
 .../org/elasticsearch/common/compress/lzf/LZFCompressor.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
index 944143b312b..9fc8705faa1 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
@@ -22,6 +22,7 @@ package org.elasticsearch.common.compress.lzf;
 import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFChunk;
+import com.ning.compress.lzf.util.ChunkEncoderFactory;
 import org.elasticsearch.common.compress.CompressedStreamOutput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -34,12 +35,12 @@ public class LZFCompressedStreamOutput extends CompressedStreamOutput<LZFCompres
     private final BufferRecycler recycler;
     private final ChunkEncoder encoder;
 
-    public LZFCompressedStreamOutput(StreamOutput out, ChunkEncoder encoder) throws IOException {
+    public LZFCompressedStreamOutput(StreamOutput out) throws IOException {
         super(out, LZFCompressorContext.INSTANCE);
         this.recycler = BufferRecycler.instance();
         this.uncompressed = this.recycler.allocOutputBuffer(LZFChunk.MAX_CHUNK_LEN);
         this.uncompressedLength = LZFChunk.MAX_CHUNK_LEN;
-        this.encoder = encoder;
+        this.encoder = ChunkEncoderFactory.safeInstance();
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
index d333b3ef4a0..ac457346dd2 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
@@ -127,7 +127,7 @@ public class LZFCompressor implements Compressor {
 
     @Override
     public CompressedStreamOutput streamOutput(StreamOutput out) throws IOException {
-        return new LZFCompressedStreamOutput(out, encoder);
+        return new LZFCompressedStreamOutput(out);
     }
 
     @Override