Don't keep ref to the dict if not loaded successfully

luben · Nov 4, 2019 · 190e4f2 · 190e4f2
1 parent 7d4d544
commit 190e4f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java b/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
@@ -103,15 +103,16 @@ public void loadDict(ZstdDictCompress dict) {
         if (nativePtr == 0) {
             throw new IllegalStateException("Compression context is closed");
         }
-        // keep a reference to the ditionary so it's not garbage collected
-        compression_dict = dict;
+
         acquireSharedLock();
         dict.acquireSharedLock();
         try {
             long result = loadCDictFast0(dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
+            // keep a reference to the dictionary so it's not garbage collected
+            compression_dict = dict;
         } finally {
             dict.releaseSharedLock();
             releaseSharedLock();

diff --git a/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java b/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java
@@ -47,15 +47,15 @@ public void loadDict(ZstdDictDecompress dict) {
         if (nativePtr == 0) {
             throw new IllegalStateException("Decompression context is closed");
         }
-        // keep a reference to the ditionary so it's not garbage collected
-        decompression_dict = dict;
         acquireSharedLock();
         dict.acquireSharedLock();
         try {
             long result = loadDDictFast0(dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
+            // keep a reference to the dictionary so it's not garbage collected
+            decompression_dict = dict;
         } finally {
             dict.releaseSharedLock();
             releaseSharedLock();