Repair a couple more misparented exception types.

jruby · Feb 28, 2018 · 96fc710 · 96fc710
1 parent 2d2eb68
commit 96fc710
Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/RubyNoMemoryError.java b/core/src/main/java/org/jruby/RubyNoMemoryError.java
@@ -35,8 +35,8 @@
  *
  * @see NoMemoryError
  */
-@JRubyClass(name="NoMemoryError", parent="StandardError")
-public class RubyNoMemoryError extends RubyStandardError {
+@JRubyClass(name="NoMemoryError", parent="Exception")
+public class RubyNoMemoryError extends RubyException {
     protected RubyNoMemoryError(Ruby runtime, RubyClass exceptionClass) {
         super(runtime, exceptionClass);
     }

diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -483,7 +483,7 @@ protected final RubyArray doCoerce(ThreadContext context, IRubyObject other, boo
         final IRubyObject result;
         try {
             result = coerceBody(context, other);
-        } catch (StandardError e) { // e.g. NoMethodError: undefined method `coerce'
+        } catch (StandardError e) {
             context.setErrorInfo($ex); // restore $!
             RubyWarnings warnings = context.runtime.getWarnings();
             warnings.warn("Numerical comparison operators will no more rescue exceptions of #coerce");

diff --git a/core/src/main/java/org/jruby/RubySecurityError.java b/core/src/main/java/org/jruby/RubySecurityError.java
@@ -35,8 +35,8 @@
  *
  * @see SecurityError
  */
-@JRubyClass(name="SecurityError", parent="StandardError")
-public class RubySecurityError extends RubyStandardError {
+@JRubyClass(name="SecurityError", parent="Exception")
+public class RubySecurityError extends RubyException {
     protected RubySecurityError(Ruby runtime, RubyClass exceptionClass) {
         super(runtime, exceptionClass);
     }

diff --git a/core/src/main/java/org/jruby/exceptions/NoMemoryError.java b/core/src/main/java/org/jruby/exceptions/NoMemoryError.java
@@ -41,7 +41,7 @@
  *
  * @see RubyNoMemoryError
  */
-public class NoMemoryError extends StandardError {
+public class NoMemoryError extends Exception {
     public NoMemoryError(String message, RubyNoMemoryError exception) {
         super(message, exception);
     }

diff --git a/core/src/main/java/org/jruby/exceptions/SecurityError.java b/core/src/main/java/org/jruby/exceptions/SecurityError.java
@@ -41,7 +41,7 @@
  *
  * @see RubySecurityError
  */
-public class SecurityError extends StandardError {
+public class SecurityError extends Exception {
     public SecurityError(String message, RubySecurityError exception) {
         super(message, exception);
     }