Reverted change relating to JRUBY-2581, reported to be logging Return…

…Jump, possible passing through impl of Java ifc git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@6833 961051c9-f516-0410-bf72-c9f7e237a7b7
jruby · May 27, 2008 · 033585b · 033585b
1 parent a133cca
commit 033585b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/org/jruby/exceptions/JumpException.java b/src/org/jruby/exceptions/JumpException.java
@@ -66,7 +66,7 @@ public static class RedoJump extends FlowControlException {}
     public static final RedoJump REDO_JUMP = new RedoJump();
     public static class SpecialJump extends FlowControlException {}
     public static final SpecialJump SPECIAL_JUMP = new SpecialJump();
-    public static class ReturnJump extends FlowControlException { public ReturnJump() {}; public void update(JumpTarget t, Object v) { target = t; value = v; }}
+    public static class ReturnJump extends FlowControlException { public ReturnJump(JumpTarget t, Object v) { target = t; value = v; }}
 
     /**
      * Constructor for flow-control-only JumpExceptions.

diff --git a/src/org/jruby/runtime/ThreadContext.java b/src/org/jruby/runtime/ThreadContext.java
@@ -107,8 +107,6 @@ public static synchronized ThreadContext newContext(Ruby runtime) {
     // appropriate place.
     private int rubyFrameDelta = 0;
 
-    private final ReturnJump RETURN_JUMP = new ReturnJump();
-
     /**
      * Constructor for Context.
      */
@@ -153,8 +151,7 @@ public IRubyObject setErrorInfo(IRubyObject errorInfo) {
     }
 
     public ReturnJump returnJump(IRubyObject value) {
-        RETURN_JUMP.update(getFrameJumpTarget(), value);
-        return RETURN_JUMP;
+        return new ReturnJump(getFrameJumpTarget(), value);
     }
 
     /**