[tika] branch main updated: TIKA-3324 -- add checkstyle plugin -- fix merge, again... :(

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new 42b719b  TIKA-3324 -- add checkstyle plugin -- fix merge, again... :(
42b719b is described below

commit 42b719b173cb8c8d893e39d4bcc0ee76aa871680
Author: tallison <ta...@apache.org>
AuthorDate: Tue Mar 16 10:09:16 2021 -0400

    TIKA-3324 -- add checkstyle plugin -- fix merge, again... :(
---
 .../src/main/java/org/apache/tika/zip/utils/ZipSalvager.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
index 1000d5f..f39ef91 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/zip/utils/ZipSalvager.java
@@ -49,7 +49,7 @@ public class ZipSalvager {
     public static void salvageCopy(InputStream brokenZip, File salvagedZip, boolean allowStoredEntries) throws IOException {
         if (!(brokenZip instanceof RereadableInputStream)) {
             brokenZip = new RereadableInputStream(brokenZip, 50000,
-                    true, false);
+                    true);
         }
         try {
             try (ZipArchiveOutputStream outputStream = new ZipArchiveOutputStream(salvagedZip);