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

Commits on May 30, 2015

  1. the require_relative test only for >= 1.9

    @mkristian
    mkristian committed May 30, 2015
    Copy the full SHA
    92a1923 View commit details

  2. fix the resource name for the classloader lookup on uri:classloader

    @mkristian
    mkristian committed May 30, 2015
    Copy the full SHA
    b32767d View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 core/src/main/java/org/jruby/util/URLResource.java
  2. +1 −1 test/test_load.rb
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/util/URLResource.java
View file
Original file line number Diff line number Diff line change
@@ -304,8 +304,8 @@ private static String[] listFiles(String pathname) {

public static URL getResourceURL(Ruby runtime, String location)
{
if (location.startsWith(URI + CLASSLOADER)){
return runtime.getJRubyClassLoader().getResource(location.substring(URI_CLASSLOADER.length()));
if (location.startsWith(URI_CLASSLOADER)){
return runtime.getJRubyClassLoader().getResource(location.substring(URI_CLASSLOADER.length() + 1));
}
try
{
2 changes: 1 addition & 1 deletion test/test_load.rb
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ def test_require_relative_via_uri_classloader_protocol
assert_nothing_raised do
require 'uri:classloader:/require_relative.rb'
end
end
end if RUBY_VERSION >= '1.9'

# JRUBY-3231
def test_load_with_empty_string_in_loadpath