dry-out interrupt mask check - raise on non Symbol (like MRI)

kares · kares · commit 349f760608b6 · 2018-12-29T09:50:50.000+01:00
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -348,14 +348,7 @@ private int pendingInterruptCheckMask(ThreadContext context, IRubyObject err) {
                 IRubyObject sym;
 
                 if (!(sym = mask.op_aref(context, klass)).isNil()) {
-                    String symStr = sym.toString();
-                    switch (symStr) {
-                        case "immediate": return INTERRUPT_IMMEDIATE;
-                        case "on_blocking": return INTERRUPT_ON_BLOCKING;
-                        case "never": return INTERRUPT_NEVER;
-                        default:
-                            throw context.runtime.newThreadError("unknown mask signature");
-                    }
+                    return checkInterruptMask(context, sym);
                 }
             }
         }
@@ -772,21 +765,24 @@ public static IRubyObject handle_interrupt(ThreadContext context, IRubyObject se
         }
     }
 
-    private static final RubyHash.VisitorWithState HandleInterruptVisitor = new RubyHash.VisitorWithState() {
+    private static final RubyHash.VisitorWithState HandleInterruptVisitor = new RubyHash.VisitorWithState<Void>() {
         @Override
-        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Object state) {
-            if (value instanceof RubySymbol) {
-                RubySymbol sym = (RubySymbol) value;
-                switch (sym.idString()) {
-                    case "immediate" : return;
-                    case "on_blocking" : return;
-                    case "never" : return;
-                    default : throw key.getRuntime().newArgumentError("unknown mask signature");
-                }
-            }
+        public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Void state) {
+            checkInterruptMask(context, value);
         }
     };
 
+    private static int checkInterruptMask(final ThreadContext context, final IRubyObject sym) {
+        if (sym instanceof RubySymbol) {
+            switch (((RubySymbol) sym).idString()) {
+                case "immediate": return INTERRUPT_IMMEDIATE;
+                case "on_blocking": return INTERRUPT_ON_BLOCKING;
+                case "never": return INTERRUPT_NEVER;
+            }
+        }
+        throw context.runtime.newArgumentError("unknown mask signature");
+    }
+
     @JRubyMethod(name = "pending_interrupt?", meta = true, optional = 1)
     public static IRubyObject pending_interrupt_p(ThreadContext context, IRubyObject self, IRubyObject[] args) {
         return context.getThread().pending_interrupt_p(context, args);
