Fixes #1285. Broken JRuby and UTF-8 method names

jruby · Apr 1, 2016 · 851974d · 851974d
1 parent 06ec9c0
commit 851974d
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/RubySymbol.java b/core/src/main/java/org/jruby/RubySymbol.java
@@ -191,7 +191,7 @@ public static RubySymbol getSymbolLong(Ruby runtime, long id) {
     /* Symbol class methods.
      *
      */
-
+    @Deprecated
     public static RubySymbol newSymbol(Ruby runtime, IRubyObject name) {
         if (name instanceof RubySymbol) {
             return runtime.getSymbolTable().getSymbol(((RubySymbol) name).getBytes(), false);
@@ -203,13 +203,11 @@ public static RubySymbol newSymbol(Ruby runtime, IRubyObject name) {
     }
 
     public static RubySymbol newHardSymbol(Ruby runtime, IRubyObject name) {
-        if (name instanceof RubySymbol) {
-            return runtime.getSymbolTable().getSymbol(((RubySymbol) name).getBytes(), true);
-        } else if (name instanceof RubyString) {
-            return runtime.getSymbolTable().getSymbol(((RubyString) name).getByteList(), true);
-        } else {
-            return newSymbol(runtime, name.asJavaString());
+        if (name instanceof RubySymbol || name instanceof RubyString) {
+            return runtime.getSymbolTable().getSymbol(name.asJavaString(), true);
         }
+
+        return newSymbol(runtime, name.asJavaString());
     }
 
     public static RubySymbol newSymbol(Ruby runtime, String name) {