Applies @knu's patch, https://gist.github.com/1160870 . This patch fi…

…xes errors of pure Java Nokogiri tests. A discussion is done at https://github.com/tenderlove/nokogiri/commit/8ee889b81a173a00bc652c68ed8ed512125ee418#commitcomment-542636
janx · Sep 2, 2011 · 636d625 · 636d625
1 parent ee230a0
commit 636d625
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/org/jruby/RubyKernel.java b/src/org/jruby/RubyKernel.java
@@ -1105,13 +1105,14 @@ public static IRubyObject caller(ThreadContext context, IRubyObject recv, IRubyO
         return context.createCallerBacktrace(context.getRuntime(), level);
     }
 
-    @JRubyMethod(name = "catch", module = true, visibility = PRIVATE)
+    @JRubyMethod(name = "catch", module = true, visibility = PRIVATE, compat = RUBY1_8)
     public static IRubyObject rbCatch(ThreadContext context, IRubyObject recv, IRubyObject tag, Block block) {
         Ruby runtime = context.runtime;
-        RubyContinuation rbContinuation = new RubyContinuation(runtime, stringOrSymbol(tag));
+        RubySymbol sym = stringOrSymbol(tag);
+        RubyContinuation rbContinuation = new RubyContinuation(runtime, sym);
         try {
             context.pushCatch(rbContinuation.getContinuation());
-            return rbContinuation.enter(context, rbContinuation, block);
+            return rbContinuation.enter(context, sym, block);
         } finally {
             context.popCatch();
         }
@@ -1120,19 +1121,19 @@ public static IRubyObject rbCatch(ThreadContext context, IRubyObject recv, IRuby
     @JRubyMethod(name = "catch", module = true, visibility = PRIVATE, compat = RUBY1_9)
     public static IRubyObject rbCatch19(ThreadContext context, IRubyObject recv, Block block) {
         IRubyObject tag = new RubyObject(context.runtime.getObject());
-        return rbCatch19Common(context, tag, block, true);
+        return rbCatch19Common(context, tag, block);
     }
 
     @JRubyMethod(name = "catch", module = true, visibility = PRIVATE, compat = RUBY1_9)
     public static IRubyObject rbCatch19(ThreadContext context, IRubyObject recv, IRubyObject tag, Block block) {
-        return rbCatch19Common(context, tag, block, false);
+        return rbCatch19Common(context, tag, block);
     }
 
-    private static IRubyObject rbCatch19Common(ThreadContext context, IRubyObject tag, Block block, boolean yieldTag) {
+    private static IRubyObject rbCatch19Common(ThreadContext context, IRubyObject tag, Block block) {
         RubyContinuation rbContinuation = new RubyContinuation(context.getRuntime(), tag);
         try {
             context.pushCatch(rbContinuation.getContinuation());
-            return rbContinuation.enter(context, yieldTag ? tag : rbContinuation, block);
+            return rbContinuation.enter(context, tag, block);
         } finally {
             context.popCatch();
         }