Pull latest archive-patcher from upstream.

am: ec0fc6394e

Change-Id: I16a9b365792e12b68f83c580e86496f0f027389f

4 files changed, 7 insertions, 6 deletions

diff --git a/README.android b/README.android
index 104ddf3..bd0bd16 100644
--- a/README.android
+++ b/README.android
@@ -1,6 +1,6 @@
 Any Android specific modifications to upstream archive-patcher should be listed
 here:
 
-(1) Deleted /integrationtest, /tools, and /generator as these are not intended
-    to be used on Android. Only /shared and /applier remain.
+(1) Deleted /integrationtest, /tools, /explainer and /generator as these are not
+    intended to be used on Android. Only /shared and /applier remain.
 
diff --git a/README.version b/README.version
index ffc3b5d..3359ef1 100644
--- a/README.version
+++ b/README.version
@@ -1,5 +1,5 @@
-URL: https://github.com/andrewhayden/archive-patcher/archive/ffadc0ce137449abfd5b72773b77e4eb7df24d19.zip
-Version: ffadc0ce137449abfd5b72773b77e4eb7df24d19
+URL: https://github.com/andrewhayden/archive-patcher/archive/5b806288f0ad7db536cc420a6b3b4d655be96cfb.zip
+Version: 5b806288f0ad7db536cc420a6b3b4d655be96cfb
 BugComponent: 129875
 Owners: andrewhayden, admo
 
diff --git a/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java b/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java
index f5f477b..8cbffda 100644
--- a/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java
+++ b/shared/src/main/java/com/google/archivepatcher/shared/DefaultDeflateCompatibilityWindow.java
@@ -355,6 +355,7 @@ public class DefaultDeflateCompatibilityWindow {
         }
       }
     }
+    compressor.release();
     return result;
   }
 }
diff --git a/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java b/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java
index 4aa88f7..0c7250b 100644
--- a/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java
+++ b/shared/src/main/java/com/google/archivepatcher/shared/DeflateCompressor.java
@@ -105,8 +105,8 @@ public class DeflateCompressor implements Compressor {
           "compressionLevel must be in the range [0,9]: " + compressionLevel);
     }
     if (deflater != null && compressionLevel != this.compressionLevel) {
-      deflater.setLevel(compressionLevel);
       deflater.reset();
+      deflater.setLevel(compressionLevel);
     }
     this.compressionLevel = compressionLevel;
   }
@@ -126,8 +126,8 @@ public class DeflateCompressor implements Compressor {
    */
   public void setStrategy(int strategy) {
     if (deflater != null && strategy != this.strategy) {
-      deflater.setStrategy(strategy);
       deflater.reset();
+      deflater.setStrategy(strategy);
     }
     this.strategy = strategy;
   }