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

Commits on Feb 24, 2017

  1. Copy the full SHA
    d46035b View commit details
  2. Copy the full SHA
    4139308 View commit details
Showing with 2 additions and 3 deletions.
  1. +0 −1 core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
  2. +1 −1 lib/pom.rb
  3. +1 −1 lib/pom.xml
Original file line number Diff line number Diff line change
@@ -458,7 +458,6 @@ private IRubyObject closeHalf(ThreadContext context, int closeHalf) {
// shutdown half
int how = closeHalf == OpenFile.READABLE ? 0 : 1;
shutdownInternal(context, fptr, how);
fptr.setMode(fptr.getMode() & ~closeHalf);

return context.nil;
}
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ def initialize( name, version, default_spec = true )
ImportedGem.new( 'minitest', '${minitest.version}' ),
ImportedGem.new( 'test-unit', '${test-unit.version}' ),
ImportedGem.new( 'power_assert', '${power_assert.version}' ),
ImportedGem.new( 'psych', '2.2.3' ),
ImportedGem.new( 'psych', '2.2.4' ),
ImportedGem.new( 'json', '${json.version}' ),
ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
ImportedGem.new( 'racc', '${racc.version}'),
2 changes: 1 addition & 1 deletion lib/pom.xml
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>psych</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>