[Truffle] No need for a workaround since jnr-constants was released.

jruby · Nov 22, 2016 · 353623b · 353623b
1 parent 93226f5
commit 353623b
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingManager.java b/truffle/src/main/java/org/jruby/truffle/core/encoding/EncodingManager.java
@@ -123,13 +123,8 @@ public Encoding getLocaleEncoding() {
         String localeEncodingName;
         try {
             final int codeset;
-            if (Platform.getPlatform().getOS() == OS.SOLARIS) {
-                // Workaround until jnr-constants is released
-                codeset = 49;
-            } else {
-                assert LangInfo.CODESET.defined();
-                codeset = LangInfo.CODESET.intValue();
-            }
+            assert LangInfo.CODESET.defined();
+            codeset = LangInfo.CODESET.intValue();
             localeEncodingName = context.getNativePlatform().getPosix().nl_langinfo(codeset);
         }
         catch (UnsupportedOperationException e) {