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

Commits on Jun 14, 2017

  1. Fixes #4671. Error installing rubygems-bundler in 9.1.11.0.

    @enebo
    enebo committed Jun 14, 2017
    Copy the full SHA
    7f97f73 View commit details

  2. Update for 9.1.12.0.

    @enebo
    enebo committed Jun 14, 2017
    Copy the full SHA
    33c6439 View commit details
Showing with 9 additions and 5 deletions.
  1. +1 −1 VERSION
  2. +1 −1 core/pom.xml
  3. +4 −0 core/src/main/java/org/jruby/ext/zlib/JZlibRubyGzipReader.java
  4. +2 −2 lib/pom.xml
  5. +1 −1 pom.xml
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.1.11.0
9.1.12.0
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.11.0</version>
<version>9.1.12.0</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/ext/zlib/JZlibRubyGzipReader.java
View file
Original file line number Diff line number Diff line change
@@ -526,6 +526,10 @@ private boolean isEof() throws IOException {
// compatible behavior.
byte[] bytes = new byte[16];
int read = bufferedStream.read(bytes, 0, bytes.length);

// We are already at EOF.
if (read == -1) return true;

bufferedStream.unread(bytes, 0, read);

return bufferedStream.available() == 0;
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.11.0</version>
<version>9.1.12.0</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.1.11.0</version>
<version>9.1.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ DO NOT MODIFIY - GENERATED CODE
</parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.1.11.0</version>
<version>9.1.12.0</version>
<packaging>pom</packaging>
<name>JRuby</name>
<description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>