Fix broken argument logic in trace_var and untrace_var.

zszugyi · Jan 23, 2012 · 7452ad4 · 7452ad4
1 parent ee76718
commit 7452ad4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/org/jruby/RubyKernel.java b/src/org/jruby/RubyKernel.java
@@ -1235,9 +1235,8 @@ public static IRubyObject set_trace_func(ThreadContext context, IRubyObject recv
 
     @JRubyMethod(required = 1, optional = 1, module = true, visibility = PRIVATE)
     public static IRubyObject trace_var(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
-        if (args.length == 0) throw context.getRuntime().newArgumentError(0, 1);
         RubyProc proc = null;
-        String var = args.length > 1 ? args[0].toString() : null;
+        String var = args[0].toString();
         // ignore if it's not a global var
         if (var.charAt(0) != '$') return context.getRuntime().getNil();
         if (args.length == 1) proc = RubyProc.newProc(context.getRuntime(), block, Block.Type.PROC);
@@ -1253,7 +1252,7 @@ public static IRubyObject trace_var(ThreadContext context, IRubyObject recv, IRu
     @JRubyMethod(required = 1, optional = 1, module = true, visibility = PRIVATE)
     public static IRubyObject untrace_var(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
         if (args.length == 0) throw context.getRuntime().newArgumentError(0, 1);
-        String var = args.length >= 1 ? args[0].toString() : null;
+        String var = args[0].toString();
 
         // ignore if it's not a global var
         if (var.charAt(0) != '$') return context.getRuntime().getNil();