Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ecae248e8931
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 39fcb5a93fd6
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 15, 2016

  1. deal around compilation issue since NativeException sub-class now ove… 

    …rrides getCause
    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    5ca1334 View commit details

  2. isDebug is enought + getCause should be final in NativeException for … 

    …less issues

... since getCause is now coming in from RubyException
    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    4482a1b View commit details

  3. no need to keep runtime around

    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    04e078c View commit details

  4. NativeException minor cleanup: deprecate unused method + private can … 

    …be static
    @kares
    kares committed Feb 15, 2016
    Copy the full SHA
    39fcb5a View commit details
Showing with 10 additions and 12 deletions.
  1. +7 −10 core/src/main/java/org/jruby/NativeException.java
  2. +3 −2 core/src/main/java/org/jruby/RubyException.java
17 changes: 7 additions & 10 deletions core/src/main/java/org/jruby/NativeException.java
View file
Original file line number Diff line number Diff line change
@@ -42,18 +42,15 @@ public class NativeException extends RubyException {

private final Throwable cause;
public static final String CLASS_NAME = "NativeException";
private final Ruby runtime;

public NativeException(Ruby runtime, RubyClass rubyClass, Throwable cause) {
super(runtime, rubyClass);
this.runtime = runtime;
this.cause = cause;
this.message = runtime.newString(cause.getClass().getName() + ": " + searchStackMessage(cause));
}

private NativeException(Ruby runtime, RubyClass rubyClass) {
super(runtime, rubyClass);
this.runtime = runtime;
this.cause = new Throwable();
this.message = runtime.newString();
}
@@ -84,6 +81,7 @@ public IRubyObject backtrace() {
if (rubyTrace.isNil()) {
return rubyTrace;
}
final Ruby runtime = getRuntime();
RubyArray array = (RubyArray) rubyTrace.dup();
StackTraceElement[] stackTrace = cause.getStackTrace();
for (int i = stackTrace.length - 1; i >= 0; i--) {
@@ -97,12 +95,12 @@ public IRubyObject backtrace() {
final String packageName = index == -1 ? "" : className.substring(0, index) + '/';
line = packageName.replace('.', '/') + element.getFileName() + ':' + element.getLineNumber() + ":in `" + element.getMethodName() + '\'';
}
RubyString string = runtime.newString(line);
array.unshift(string);
array.unshift(runtime.newString(line));
}
return array;
}

@Deprecated // not used
public void trimStackTrace(Member target) {
Throwable t = new Throwable();
StackTraceElement[] origStackTrace = cause.getStackTrace();
@@ -143,19 +141,18 @@ public void trimStackTrace(Member target) {

public void printBacktrace(PrintStream errorStream) {
super.printBacktrace(errorStream);
if (getRuntime().getDebug().isTrue()) {
if (getRuntime().isDebug()) {
errorStream.println("Complete Java stackTrace");
cause.printStackTrace(errorStream);
}
}

public Throwable getCause() {
public final Throwable getCause() {
return cause;
}

private String searchStackMessage(Throwable cause) {
String message = null;

private static String searchStackMessage(Throwable cause) {
String message;
do {
message = cause.getMessage();
cause = cause.getCause();
5 changes: 3 additions & 2 deletions core/src/main/java/org/jruby/RubyException.java
View file
Original file line number Diff line number Diff line change
@@ -206,7 +206,8 @@ public void setCause(IRubyObject cause) {
this.cause = cause;
}

public IRubyObject getCause() {
// NOTE: can not have IRubyObject as NativeException has getCause() returning Throwable
public Object getCause() {
return cause;
}

@@ -393,7 +394,7 @@ public IRubyObject getMessage() {
private BacktraceData backtraceData;
private IRubyObject backtrace;
public IRubyObject message;
private IRubyObject cause;
IRubyObject cause;

public static final int TRACE_HEAD = 8;
public static final int TRACE_TAIL = 4;