Fixes #3126. load current directory file

jruby · Jul 16, 2015 · 2366376 · 2366376
1 parent 7d3bc47
commit 2366376
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
@@ -33,6 +33,7 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.runtime.load;
 
+import org.jruby.util.FileResource;
 import org.jruby.util.collections.StringArraySet;
 import java.io.File;
 import java.io.FileDescriptor;
@@ -321,8 +322,13 @@ public void load(String file, boolean wrap) {
 
             Library library = findLibraryBySearchState(state);
 
+            // load() will do a last chance look in current working directory for the file (see load.c:rb_f_load()).
             if (library == null) {
-              throw runtime.newLoadError("no such file to load -- " + file, file);
+                FileResource fileResource = JRubyFile.createResourceAsFile(runtime, file);
+
+                if (!fileResource.exists()) throw runtime.newLoadError("no such file to load -- " + file, file);
+
+                library = LibrarySearcher.ResourceLibrary.create(file, file, fileResource);
             }
 
             try {