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

Commits on Mar 13, 2015

  1. [Truffle] Fix FindBugs warning in Thread#join

    @chrisseaton
    chrisseaton committed Mar 13, 2015
    Copy the full SHA
    ebfda0f View commit details

  2. [Truffle] Ignore FindBugs in some unusual primitive nodes.

    @chrisseaton
    chrisseaton committed Mar 13, 2015
    Copy the full SHA
    9c33101 View commit details
Showing with 19 additions and 4 deletions.
  1. +16 −0 tool/truffle-findbugs-exclude.xml
  2. +3 −4 truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java
16 changes: 16 additions & 0 deletions tool/truffle-findbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
@@ -74,4 +74,20 @@
<Class name="org.jruby.truffle.runtime.subsystems.SimpleShell" />
<Bug pattern="DM_EXIT" />
</Match>
<Match>
<Class name="org.jruby.truffle.nodes.debug.AssertConstantNode" />
<Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY" />
</Match>
<Match>
<Class name="org.jruby.truffle.nodes.debug.AssertNotCompiledNode" />
<Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY" />
</Match>
<Match>
<Class name="org.jruby.truffle.nodes.debug.AssertConstantNode" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
</Match>
<Match>
<Class name="org.jruby.truffle.nodes.debug.AssertNotCompiledNode" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
</Match>
</FindBugsFilter>
7 changes: 3 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java
View file
Original file line number Diff line number Diff line change
@@ -137,15 +137,14 @@ public Boolean block() throws InterruptedException {
}

public void join(final int timeout) {
getContext().getThreadManager().runUntilResult(new BlockingActionWithoutGlobalLock<Boolean>() {
final boolean joined = getContext().getThreadManager().runOnce(new BlockingActionWithoutGlobalLock<Boolean>() {
@Override
public Boolean block() throws InterruptedException {
finished.await(timeout, TimeUnit.SECONDS);
return SUCCESS;
return finished.await(timeout, TimeUnit.SECONDS);
}
});

if (exception != null) {
if (joined && exception != null) {
throw new RaiseException(exception);
}
}