misc cleanup

jruby · Dec 27, 2017 · 3bcdcd3 · 3bcdcd3
1 parent f8f7077
commit 3bcdcd3
Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/org/jcodings/unicode/UnicodeEncoding.java b/src/org/jcodings/unicode/UnicodeEncoding.java
@@ -579,9 +579,9 @@ private static CaseInsensitiveBytesHash<Integer> initializeCTypeNameTable() {
     private static class CodeList {
         CodeList(DataInputStream dis) throws IOException {
             int packed = dis.readInt();
-            this.flags = packed & ~Config.CodePointMask;
+            flags = packed & ~Config.CodePointMask;
             int length = packed & Config.CodePointMask;
-            this.codes = new int[length];
+            codes = new int[length];
             for (int j = 0; j < length; j++) {
                 codes[j] = dis.readInt();
             }
@@ -744,12 +744,13 @@ static ArrayList<int[]> read() {
                     }
                     values.add(codes);
                 }
+                dis.close();
                 return values;
             } catch (IOException ioe) {
                 throw new RuntimeException(ioe);
             }
         }
 
-        private static ArrayList<int[]> Values = read();
+        static final ArrayList<int[]> Values = read();
     }
 }
diff --git a/test/org/jcodings/specific/TestUnicode.java b/test/org/jcodings/specific/TestUnicode.java
@@ -39,7 +39,7 @@ String caseMap(String fromS, int flags) throws Exception {
         IntHolder flagP = new IntHolder();
         flagP.value = flags;
         int len = enc.caseMap(flagP, from, fromP, from.length, to, 0, to.length);
-        return new String(to, 0, len);
+        return new String(to, 0, len, "utf-8");
     }
 
     @Test