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

Commits on Feb 27, 2015

  1. [Truffle] Fix (very useful) FindBugs warning about removing the wrong… 

    … type from a set.
    @chrisseaton
    chrisseaton committed Feb 27, 2015
    Copy the full SHA
    8cbc714 View commit details

  2. [Truffl] exit in the simple shell is fine for FindBugs.

    @chrisseaton
    chrisseaton committed Feb 27, 2015
    Copy the full SHA
    97f7aa8 View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −0 tool/truffle-findbugs-exclude.xml
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
4 changes: 4 additions & 0 deletions tool/truffle-findbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
@@ -70,4 +70,8 @@
<Match>
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON" />
</Match>
<Match>
<Class name="org.jruby.truffle.runtime.subsystems.SimpleShell" />
<Bug pattern="DM_EXIT" />
</Match>
</FindBugsFilter>
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/subsystems/SafepointManager.java
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ public void leaveThread() {
CompilerAsserts.neverPartOfCompilation();

phaser.arriveAndDeregister();
runningThreads.remove(Thread.currentThread());
runningThreads.remove(new RunningThread(Thread.currentThread(), false));
}

public void poll() {