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

Commits on Feb 25, 2016

  1. Don't expect port 22 to be open on localhost.

    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    6f10c87 View commit details

  2. Restore graceful back-off when rubygems can't be loaded. 

    This is the likely reason for recent jruby.home commits.
    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    b869164 View commit details

  3. Revert "jruby.home seems to be needed here too. Did something change?" 

    This reverts commit 080709d.
    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    4766eff View commit details

  4. Revert "Add jruby.home to this java invocation." 

    This reverts commit 3806de1.
    @headius
    headius committed Feb 25, 2016
    Copy the full SHA
    46a698e View commit details
12 changes: 9 additions & 3 deletions core/src/main/ruby/jruby/kernel/gem_prelude.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
if defined?(Gem)
require 'rubygems.rb'
begin
require 'did_you_mean'
require 'rubygems'
rescue LoadError
end if defined?(DidYouMean)
# For JRUBY-5333, gracefully fail to load, since stdlib may not be available
warn 'RubyGems not found; disabling gems' if $VERBOSE
else
begin
require 'did_you_mean'
rescue LoadError
end if defined?(DidYouMean)
end
end
8 changes: 0 additions & 8 deletions core/src/main/ruby/jruby/kernel/rubygems.rb
View file

This file was deleted.

1 change: 0 additions & 1 deletion maven/jruby-dist/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -109,7 +109,6 @@
<arguments>
<argument>-classpath</argument>
<argument>-Xbootclasspath/a:${jruby.home}/lib/jruby.jar</argument>
<argument>-Djruby.home=${jruby.home}</argument>
<argument>org.jruby.Main</argument>
<argument>-e</argument>
<argument>p JRuby.runtime.jruby_home</argument>
2 changes: 1 addition & 1 deletion test/jruby/test_load_compiled_ruby_class_from_classpath.rb
View file
Original file line number Diff line number Diff line change
@@ -85,7 +85,7 @@ def test_loading_compiled_ruby_class_from_jar
remove_ruby_source_files

java = ENV['JAVA_HOME'] ? "#{ENV['JAVA_HOME']}/bin/java" : "java"
java_cmd = "#{java} -Djruby.home=#{ENV_JAVA['jruby.home']} -jar -Djruby.aot.loadClasses=true #{JarFile}"
java_cmd = "#{java} -jar -Djruby.aot.loadClasses=true #{JarFile}"
puts java_cmd if $VERBOSE; result = `#{java_cmd}`
assert_equal 0, $?.exitstatus, "did not get 0 for exit status from running java against the jar"
assert_equal "hello from runner", result, "wrong text from runner"
7 changes: 6 additions & 1 deletion test/jruby/test_socket.rb
View file
Original file line number Diff line number Diff line change
@@ -231,12 +231,17 @@ def test_tcp_socket_errors
else; fail 'not raised'
end

socket = TCPSocket.new('127.0.0.1', 22)
server = TCPServer.new('127.0.0.1', 10022)
Thread.new { server.accept }
socket = TCPSocket.new('127.0.0.1', 10022)
begin
socket.read_nonblock 100
rescue IO::EAGAINWaitReadable
# Resource temporarily unavailable - read would block
else; fail 'not raised'
ensure
server.close rescue nil
socket.close rescue nil
end
end