fix merge issue on require_relative

jruby · Jul 27, 2015 · 8305707 · 8305707
1 parent 00e086e
commit 8305707
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/ruby/jruby/kernel/kernel.rb b/core/src/main/ruby/jruby/kernel/kernel.rb
@@ -8,7 +8,7 @@ def require_relative(relative_arg)
     file = $` # just the filename
     raise LoadError, "cannot infer basepath" if /\A\((.*)\)/ =~ file # eval etc.
 
-    absolute_feature = File.expand_path(relative_arg, File.dirname(file))
+    absolute_feature = File.expand_path(relative_arg, File.dirname(File.realpath(file)))
 
     require absolute_feature
   end