Changeset 33724 for main/trunk/gli/src/org/greenstone/gatherer/feedback/Base64.java

Timestamp:

2019-11-27T23:41:30+13:00 (4 years ago)

Author:

ak19

Message:

1. A bugfix to Base64.decode(String s) to handle null strings returned from Base64.decode(byte[], ...) variant. 2. Adding a copy of the stringToHex function debugUnicodeString() to gli code.

File:

• main/trunk/gli/src/org/greenstone/gatherer/feedback/Base64.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/feedback/Base64.java

@@ -720 +720 @@
     {   
         byte[] bytes = s.getBytes();
+        byte[] origBytes = bytes;
         bytes = decode( bytes, 0, bytes.length );
-        
+        
+        // if something went wrong base64 decoding the string, just return the original bytes
+        if(bytes == null) {
+            return origBytes;
+        }
+        
         // Check to see if it's gzip-compressed
         // GZIP Magic Two-Byte Number: 0x8b1f (35615)