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: b0e998c4ba23
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c89f25f4a377
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 4, 2015

  1. Thread cleanup - unused field + use local runtime var + add generics … 

    …for updater
    @kares
    kares committed Dec 4, 2015
    Copy the full SHA
    50a21e8 View commit details

  2. fix Thread#inspect .rb:line + 1 to match Java thread name reported lo… 

    …cation file:line
    @kares
    kares committed Dec 4, 2015
    Copy the full SHA
    5cdc065 View commit details

  3. include location on Thread#inspect if line == 0

    @kares
    kares committed Dec 4, 2015
    Copy the full SHA
    c89f25f View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 core/src/main/java/org/jruby/RubyThread.java
14 changes: 7 additions & 7 deletions core/src/main/java/org/jruby/RubyThread.java
View file
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ public class RubyThread extends RubyObject implements ExecutionContext {
private volatile WeakReference<ThreadContext> contextRef;

/** Whether to scan for cross-thread events */
private volatile boolean handleInterrupt = true;
//private volatile boolean handleInterrupt = true;

/** Stack of interrupt masks active for this thread */
private final List<RubyHash> interruptMaskStack = Collections.synchronizedList(new ArrayList<RubyHash>());
@@ -196,7 +196,7 @@ public static enum Status {

private volatile Selector currentSelector;

private static final AtomicIntegerFieldUpdater INTERRUPT_FLAG_UPDATER =
private static final AtomicIntegerFieldUpdater<RubyThread> INTERRUPT_FLAG_UPDATER =
AtomicIntegerFieldUpdater.newUpdater(RubyThread.class, "interruptFlag");

private static final int TIMER_INTERRUPT_MASK = 0x01;
@@ -1088,8 +1088,8 @@ public synchronized IRubyObject inspect() {
if ( name != null ) {
part.append('@').append(name);
}
if ( file != null && line > 0 ) {
part.append('@').append(file).append(':').append(line);
if ( file != null && line >= 0 ) {
part.append('@').append(file).append(':').append(line + 1);
}
part.append(' ');
part.append(status.toString().toLowerCase());
@@ -1244,15 +1244,15 @@ public IRubyObject genericRaise(Ruby runtime, IRubyObject[] args, RubyThread cur
}

private IRubyObject prepareRaiseException(Ruby runtime, IRubyObject[] args, Block block) {
if(args.length == 0) {
if (args.length == 0) {
IRubyObject lastException = errorInfo;
if(lastException.isNil()) {
if (lastException.isNil()) {
return new RaiseException(runtime, runtime.getRuntimeError(), "", false).getException();
}
return lastException;
}

final ThreadContext context = getRuntime().getCurrentContext();
final ThreadContext context = runtime.getCurrentContext();
final IRubyObject arg = args[0];

final IRubyObject exception;