Sync to 8ffe39d965862e3659c68208efa9147adcaea3bb.
am: d5ab575b01
Change-Id: Id2d93fe021efe03006191d851f0492fbd9b09ec7
diff --git a/README.version b/README.version
index 3359ef1..e2809f8 100644
--- a/README.version
+++ b/README.version
@@ -1,5 +1,5 @@
-URL: https://github.com/andrewhayden/archive-patcher/archive/5b806288f0ad7db536cc420a6b3b4d655be96cfb.zip
-Version: 5b806288f0ad7db536cc420a6b3b4d655be96cfb
+URL: https://github.com/andrewhayden/archive-patcher/archive/8ffe39d965862e3659c68208efa9147adcaea3bb.zip
+Version: 8ffe39d965862e3659c68208efa9147adcaea3bb
BugComponent: 129875
Owners: andrewhayden, admo
diff --git a/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java b/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java
index 63dbd82..d0a578b 100644
--- a/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java
+++ b/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java
@@ -83,25 +83,19 @@
// takes up the rest of the patch stream - so there is no need to examine the list of
// DeltaDescriptors in the patch at all.
long deltaLength = plan.getDeltaDescriptors().get(0).getDeltaLength();
- PartiallyCompressingOutputStream recompressingNewBlobOut = null;
DeltaApplier deltaApplier = getDeltaApplier();
// Don't close this stream, as it is just a limiting wrapper.
@SuppressWarnings("resource")
LimitedInputStream limitedDeltaIn = new LimitedInputStream(deltaIn, deltaLength);
- try {
- recompressingNewBlobOut =
- new PartiallyCompressingOutputStream(
- plan.getDeltaFriendlyNewFileRecompressionPlan(),
- newBlobOut,
- DEFAULT_COPY_BUFFER_SIZE);
- deltaApplier.applyDelta(deltaFriendlyOldBlob, limitedDeltaIn, recompressingNewBlobOut);
- } finally {
- try {
- recompressingNewBlobOut.close();
- } catch (Exception ignored) {
- // Nothing
- }
- }
+ // Don't close this stream, as it would close the underlying OutputStream (that we don't own).
+ @SuppressWarnings("resource")
+ PartiallyCompressingOutputStream recompressingNewBlobOut =
+ new PartiallyCompressingOutputStream(
+ plan.getDeltaFriendlyNewFileRecompressionPlan(),
+ newBlobOut,
+ DEFAULT_COPY_BUFFER_SIZE);
+ deltaApplier.applyDelta(deltaFriendlyOldBlob, limitedDeltaIn, recompressingNewBlobOut);
+ recompressingNewBlobOut.flush();
}
/**
diff --git a/applier/src/test/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplierTest.java b/applier/src/test/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplierTest.java
index b2ebf93..8cf75fd 100644
--- a/applier/src/test/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplierTest.java
+++ b/applier/src/test/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplierTest.java
@@ -35,6 +35,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* Tests for {@link FileByFileV1DeltaApplier}.
@@ -50,7 +51,7 @@
// delta-friendly new file := UNCOMPRESSED_HEADER + UNCOMPRESSED_NEW_CONTENT +
// UNCOMPRESSED_TRAILER
// new file := UNCOMPRESSED_HEADER + COMPRESSED_NEW_CONTENT + UNCOMPRESSED_TRAILIER
- // NB: The patch *applietr* is agnostic to the format of the file, and so it doesn't have to be a
+ // NB: The patch *applier* is agnostic to the format of the file, and so it doesn't have to be a
// valid zip or zip-like archive.
private static final JreDeflateParameters PARAMS1 = JreDeflateParameters.of(6, 0, true);
private static final String OLD_CONTENT = "This is Content the Old";
@@ -93,10 +94,26 @@
*/
private byte[] oldFileBytes;
+ /**
+ * Again, for debugging test issues, it is convenient to be able to see these bytes in the
+ * debugger instead of on the filesystem.
+ */
private byte[] expectedDeltaFriendlyOldFileBytes;
+ /**
+ * To mock the dependency on bsdiff, a subclass of FileByFileV1DeltaApplier is made that always
+ * returns a testing delta applier. This delta applier asserts that the old content is as
+ * expected, and "patches" it by simply writing the expected *new* content to the output stream.
+ */
+ private FileByFileV1DeltaApplier fakeApplier;
+
@Before
public void setUp() throws IOException {
+ // Creates the following resources:
+ // 1. The old file, on disk (and in-memory, for convenience).
+ // 2. The new file, in memory only (for comparing results at the end).
+ // 3. The patch, in memory.
+
File tempFile = File.createTempFile("foo", "bar");
tempDir = tempFile.getParentFile();
tempFile.delete();
@@ -130,6 +147,14 @@
// Finally, write the patch that should transform old to new
patchBytes = writePatch();
+
+ // Initialize fake delta applier to mock out dependency on bsdiff
+ fakeApplier = new FileByFileV1DeltaApplier(tempDir) {
+ @Override
+ protected DeltaApplier getDeltaApplier() {
+ return new FakeDeltaApplier();
+ }
+ };
}
/**
@@ -219,28 +244,27 @@
@Test
public void testApplyDelta() throws IOException {
// Test all aspects of patch apply: copying, uncompressing and recompressing ranges.
- //
- // To mock the dependency on bsdiff, a subclass of FileByFileV1DeltaApplier is made that always
- // returns a testing delta applier. This delta applier asserts that the old content is as
- // expected, and "patches" it by simply writing the expected *new* content to the output stream.
- //
- // The test harness creates the following resources:
- // 1. The old file, on disk (and in-memory, for convenience).
- // 2. The new file, in memory only (for comparing results at the end).
- // 3. The patch, in memory.
- //
// This test uses the subclasses applier to apply the test patch to the old file, producing the
// new file. Along the way the entry is uncompressed, altered by the testing delta applier, and
// recompressed. It's deceptively simple below, but this is a lot of moving parts.
- FileByFileV1DeltaApplier applier =
- new FileByFileV1DeltaApplier(tempDir) {
- @Override
- protected DeltaApplier getDeltaApplier() {
- return new FakeDeltaApplier();
- }
- };
ByteArrayOutputStream actualNewBlobOut = new ByteArrayOutputStream();
- applier.applyDelta(oldFile, new ByteArrayInputStream(patchBytes), actualNewBlobOut);
+ fakeApplier.applyDelta(oldFile, new ByteArrayInputStream(patchBytes), actualNewBlobOut);
Assert.assertArrayEquals(expectedNewBytes, actualNewBlobOut.toByteArray());
}
+
+ @Test
+ public void testApplyDelta_DoesntCloseStream() throws IOException {
+ // Test for https://github.com/andrewhayden/archive-patcher/issues/6
+ final AtomicBoolean closed = new AtomicBoolean(false);
+ ByteArrayOutputStream actualNewBlobOut = new ByteArrayOutputStream() {
+ @Override
+ public void close() throws IOException {
+ closed.set(true);
+ }
+ };
+ fakeApplier.applyDelta(oldFile, new ByteArrayInputStream(patchBytes), actualNewBlobOut);
+ Assert.assertArrayEquals(expectedNewBytes, actualNewBlobOut.toByteArray());
+ Assert.assertFalse(closed.get());
+ }
+
}
