Revert "update jcodings and use isUnicode fast lookup"

This reverts commit 6b15448.
jruby · Dec 15, 2015 · df1759e · df1759e
1 parent 6b15448
commit df1759e
Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -53,7 +53,7 @@
 
   jar 'org.jruby.joni:joni:2.1.8'
   jar 'org.jruby.extras:bytelist:1.0.13'
-  jar 'org.jruby.jcodings:jcodings:1.0.14'
+  jar 'org.jruby.jcodings:jcodings:1.0.13'
   jar 'org.jruby:dirgra:0.3'
 
   jar 'com.headius:invokebinder:1.5'

diff --git a/core/pom.xml b/core/pom.xml
@@ -184,7 +184,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.jcodings</groupId>
       <artifactId>jcodings</artifactId>
-      <version>1.0.14</version>
+      <version>1.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.jruby</groupId>

diff --git a/core/src/main/java/org/jruby/util/io/EncodingUtils.java b/core/src/main/java/org/jruby/util/io/EncodingUtils.java
@@ -1842,7 +1842,7 @@ public static Encoding getEncoding(ByteList str) {
 
     // MRI: get_actual_encoding
     public static Encoding getActualEncoding(Encoding enc, ByteList byteList) {
-        if (enc.isDummy() && enc.isUnicode()) {
+        if (enc.isDummy() && enc instanceof UnicodeEncoding) {
             // handle dummy UTF-16 and UTF-32 by scanning for BOM, as in MRI
             byte[] bytes = byteList.unsafeBytes();
             int p = byteList.begin();