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

Commits on Jul 14, 2015

  1. Return nil when waitpid returns 0. Fixes #3117.

    @headius
    headius committed Jul 14, 2015
    Copy the full SHA
    30cfff8 View commit details

  2. Fix references to old mailing lists.

    @headius
    headius committed Jul 14, 2015
    Copy the full SHA
    935553d View commit details
Showing with 9 additions and 16 deletions.
  1. +8 −3 core/src/main/java/org/jruby/RubyProcess.java
  2. +1 −13 pom.xml
11 changes: 8 additions & 3 deletions core/src/main/java/org/jruby/RubyProcess.java
View file
Original file line number Diff line number Diff line change
@@ -534,9 +534,14 @@ public static IRubyObject waitpid(Ruby runtime, IRubyObject[] args) {
runtime.getPosix().errno(0);
pid = runtime.getPosix().waitpid(pid, status, flags);
raiseErrnoIfSet(runtime, ECHILD);

runtime.getCurrentContext().setLastExitStatus(RubyProcess.RubyStatus.newProcessStatus(runtime, (status[0] >> 8) & 0xff, pid));
return runtime.newFixnum(pid);

if (pid > 0) {
runtime.getCurrentContext().setLastExitStatus(RubyProcess.RubyStatus.newProcessStatus(runtime, (status[0] >> 8) & 0xff, pid));
return runtime.newFixnum(pid);
} else {
runtime.getCurrentContext().setLastExitStatus(runtime.getNil());
return runtime.getNil();
}
}

private interface NonNativeErrno {
14 changes: 1 addition & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -105,19 +105,7 @@
<mailingLists>
<mailingList>
<name>jruby</name>
<archive>http://markmail.org/search/list:org.codehaus.jruby.user</archive>
</mailingList>
<mailingList>
<name>jruby-dev</name>
<archive>http://markmail.org/search/list:org.codehaus.jruby.dev</archive>
</mailingList>
<mailingList>
<name>jruby-scm</name>
<archive>http://markmail.org/search/list:org.codehaus.jruby.scm</archive>
</mailingList>
<mailingList>
<name>jruby-announce</name>
<archive>http://markmail.org/search/list:org.codehaus.jruby.announce</archive>
<archive>http://blade.nagaokaut.ac.jp/ruby/jruby/index.shtml</archive>
</mailingList>
</mailingLists>