Revert "Classpath urls should still use expand_path to properly canon…

…icalize the path. This fixes no reported issue" This reverts commit 429149e.
jruby · Jan 7, 2014 · 39056c6 · 39056c6
1 parent 4465313
commit 39056c6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/ruby/jruby/kernel/kernel.rb b/core/src/main/ruby/jruby/kernel/kernel.rb
@@ -12,8 +12,8 @@ def require_relative(relative_arg)
     # know about classpath: paths.
     if file =~ /^classpath:(.*)/
       dir = File.dirname($1)
-      dir = '' if dir == '.'
-      absolute_feature = "classpath:" + File.expand_path(relative_arg, dir)
+      dir = dir == '.' ? "" : dir + "/"
+      absolute_feature = "classpath:#{dir}#{relative_arg}"
     else
       absolute_feature = File.expand_path(relative_arg, File.dirname(file))
     end