Revert part of change in #7466 to fix issue because encoder is not threadsafe so cannot be shared

This commit is contained in:
Ryan Ernst 2014-08-26 14:04:59 -07:00
parent d79c79c7d0
commit c94c13fa26
2 changed files with 4 additions and 3 deletions

View File

@ -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

View File

@ -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