Exception.cause was NPEing (one constructor path was not initializing…

… it).
jruby · Mar 30, 2018 · 64d4fd8 · kares · Mar 31, 2018 · enebo
1 parent 259b89e
commit 64d4fd8
Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/RubyException.java b/core/src/main/java/org/jruby/RubyException.java
@@ -71,7 +71,7 @@ public class RubyException extends RubyObject {
     public static final int TRACE_MAX = RubyException.TRACE_HEAD + RubyException.TRACE_TAIL + 6;
     protected BacktraceData backtraceData;
     IRubyObject message;
-    IRubyObject cause;
+    IRubyObject cause = UNDEF;
     private IRubyObject backtrace;
     private RaiseException throwable;
     private IRubyObject backtraceLocations;
@@ -84,7 +84,6 @@ public RubyException(Ruby runtime, RubyClass rubyClass, String message) {
         super(runtime, rubyClass);
 
         this.setMessage(message == null ? runtime.getNil() : runtime.newString(message));
-        this.cause = RubyBasicObject.UNDEF;
     }
 
     @JRubyMethod(name = "exception", optional = 1, rest = true, meta = true)
@@ -210,7 +209,7 @@ private void setBacktrace(IRubyObject obj) {
     @JRubyMethod(omit = true)
     public IRubyObject backtrace_locations(ThreadContext context) {
         if (backtraceLocations != null) return backtraceLocations;
-        
+
         if (backtraceData == null) {
             backtraceLocations = context.nil;
         } else {
@@ -327,7 +326,7 @@ public void setCause(IRubyObject cause) {
 
     // NOTE: can not have IRubyObject as NativeException has getCause() returning Throwable
     public Object getCause() {
-        return cause == RubyBasicObject.UNDEF ? null : cause;
+        return cause.isNil() ? null : cause;
     }
 
     public void setBacktraceData(BacktraceData backtraceData) {

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -885,7 +885,7 @@ public static IRubyObject raise(ThreadContext context, IRubyObject recv, IRubyOb
             printExceptionSummary(runtime, raise.getException());
         }
 
-        if (forceCause || argc > 0 && raise.getException().cause == UNDEF && cause != raise.getException()) {
+        if (forceCause || argc > 0 && raise.getException().getCause() == UNDEF && cause != raise.getException()) {
             raise.getException().setCause(cause);
         }