[tika] branch master updated: TIKA-2909 -- mea culpa...sorry. Make HwpTextExtractorV5 serializable and fix the locale problems.

[ta...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1845c4c  TIKA-2909 -- mea culpa...sorry.  Make HwpTextExtractorV5 serializable and fix the locale problems.
1845c4c is described below

commit 1845c4cbbc66734314dd21056ccc805f6fa18be6
Author: TALLISON <ta...@apache.org>
AuthorDate: Mon Jul 22 12:14:55 2019 -0400

    TIKA-2909 -- mea culpa...sorry.  Make HwpTextExtractorV5 serializable
    and fix the locale problems.
---
 .../java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java b/tika-parsers/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
index 625d9c5..4eaedf4 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/hwp/HwpTextExtractorV5.java
@@ -25,12 +25,15 @@ import java.io.EOFException;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
@@ -57,13 +60,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-public class HwpTextExtractorV5 {
-
+public class HwpTextExtractorV5 implements Serializable {
+    private static final long serialVersionUID = 1L;
     protected static Logger LOG = LoggerFactory
             .getLogger(HwpTextExtractorV5.class);
 
     private static final byte[] HWP_V5_SIGNATURE = "HWP Document File"
-            .getBytes();
+            .getBytes(StandardCharsets.US_ASCII);
 
     private static final int HWPTAG_BEGIN = 0x010;
 
@@ -491,7 +494,8 @@ public class HwpTextExtractorV5 {
         int r;
 
         public String toString() {
-            return String.format("%d.%d.%d.%d", m, n, p, r);
+            return String.format(
+                    Locale.US, "%d.%d.%d.%d", m, n, p, r);
         }
 
         public static HwpVersion parseVersion(long longVersion) {