Do not rescue java.lang.Error using StandardError

grddev · grddev · commit 63eefe64aeb7 · 2014-05-14T17:42:08.000+02:00
This in effect injects java.lang.Error as a subclass of Ruby Exception, instead of StandardError as was previously the case. This fixes #1696
diff --git a/core/src/main/java/org/jruby/RubyException.java b/core/src/main/java/org/jruby/RubyException.java
@@ -196,7 +196,9 @@ public static IRubyObject op_eqq(ThreadContext context, IRubyObject recv, IRubyO
 
             Object object = ((ConcreteJavaProxy)other).getObject();
             if (object instanceof Throwable && !(object instanceof FlowControlException)) {
-                return context.runtime.getTrue();
+                if (recv == runtime.getException() || object instanceof Exception) {
+                    return context.runtime.getTrue();
+                }
             }
         }
         // fall back on default logic
diff --git a/spec/java_integration/exceptions/rescue_spec.rb b/spec/java_integration/exceptions/rescue_spec.rb
@@ -4,18 +4,68 @@
 java_import "java_integration.fixtures.ThrowExceptionInInitializer"
 java_import "java_integration.fixtures.ExceptionRunner"
 
-describe "A non-wrapped Java throwable" do
+describe "A non-wrapped Java error" do
   it "can be rescued using the Java type" do
     exception = OutOfMemoryError.new
     begin
       raise exception
     rescue OutOfMemoryError => oome
     end
-    
-    oome.should_not == nil
+
     oome.should == exception
   end
 
+  it "can be rescued using Object" do
+    begin
+      raise OutOfMemoryError.new
+    rescue Object => e
+      e.should be_kind_of(OutOfMemoryError)
+    end
+  end
+
+  it "can be rescued using Exception" do
+    exception = OutOfMemoryError.new
+    begin
+      raise exception
+    rescue Exception => e
+    end
+
+    e.should == exception
+  end
+
+  it "cannot be rescued using StandardError" do
+    exception = OutOfMemoryError.new
+    lambda do
+      begin
+        raise exception
+      rescue => e
+      end
+    end.should raise_error(exception)
+  end
+
+  it "cannot be rescued inline" do
+    obj = Object.new
+    def obj.go
+      raise OutOfMemoryError.new
+    end
+
+    lambda do
+      obj.go rescue 'foo'
+    end.should raise_error(OutOfMemoryError)
+  end
+end
+
+describe "A non-wrapped Java exception" do
+  it "can be rescued using the Java type" do
+    exception = java.lang.NullPointerException.new
+    begin
+      raise exception
+    rescue java.lang.NullPointerException => npe
+    end
+
+    npe.should == exception
+  end
+
   it "can be rescued using Object" do
     begin
       raise java.lang.NullPointerException.new

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,9 @@ public static IRubyObject op_eqq(ThreadContext context, IRubyObject recv, IRubyO`
`196`	`196`
`197`	`197`	`Object object = ((ConcreteJavaProxy)other).getObject();`
`198`	`198`	`if (object instanceof Throwable && !(object instanceof FlowControlException)) {`
`199`		`- return context.runtime.getTrue();`
	`199`	`+ if (recv == runtime.getException() \|\| object instanceof Exception) {`
	`200`	`+ return context.runtime.getTrue();`
	`201`	`+ }`
`200`	`202`	`}`
`201`	`203`	`}`
`202`	`204`	`// fall back on default logic`