aboutsummaryrefslogtreecommitdiff
path: root/src/org/tukaani
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2012-01-28 10:13:25 +0200
committerLasse Collin <lasse.collin@tukaani.org>2012-01-28 10:13:25 +0200
commit642bbd01f48218d3c4c75cb761b06be768feb51b (patch)
treeb27ea7a86a4dc0c25c7faf8e92ea946b2f5b85ab /src/org/tukaani
parent8d70af0f17b7186d35fb8da77b650bd6ebd90d3a (diff)
downloadxz-java-642bbd01f48218d3c4c75cb761b06be768feb51b.tar.gz
Fix preset dictionary handling in LZMA2OutputStream.
Dictionary must not be reset in the beginning of the stream when a preset dictionary is used.
Diffstat (limited to 'src/org/tukaani')
-rw-r--r--src/org/tukaani/xz/LZMA2OutputStream.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/org/tukaani/xz/LZMA2OutputStream.java b/src/org/tukaani/xz/LZMA2OutputStream.java
index b4ff739..0865a14 100644
--- a/src/org/tukaani/xz/LZMA2OutputStream.java
+++ b/src/org/tukaani/xz/LZMA2OutputStream.java
@@ -66,7 +66,12 @@ class LZMA2OutputStream extends FinishableOutputStream {
options.getMatchFinder(), options.getDepthLimit());
lz = lzma.getLZEncoder();
- lz.setPresetDict(dictSize, options.getPresetDict());
+
+ byte[] presetDict = options.getPresetDict();
+ if (presetDict != null && presetDict.length > 0) {
+ lz.setPresetDict(dictSize, presetDict);
+ dictResetNeeded = false;
+ }
props = (options.getPb() * 5 + options.getLp()) * 9 + options.getLc();
}