jruby · Feb 16, 2015 · Feb 16, 2015 · Feb 16, 2015
diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -133,6 +133,12 @@ private FoundLibrary findResourceLibrary(String baseName, String suffix) {
           return findFileResource(baseName, suffix);
         }
 
+        baseName = baseName.replace("classpath:", "");
+        // formally obey the fact that the current directory is NOT implicitly on the LOAD_PATH
+        if (! new File(baseName).exists()) {
+            FoundLibrary library = findFileResourceWithLoadPath(baseName, suffix, URLResource.URI_CLASSLOADER);
+            if (library != null) return library;
+        }
         try {
             for (IRubyObject loadPathEntry : loadService.loadPath.toJavaArray()) {
                 FoundLibrary library = findFileResourceWithLoadPath(baseName, suffix, getPath(loadPathEntry));
@@ -263,12 +269,7 @@ private void loadClass(Ruby runtime, InputStream is, boolean wrap) {
         private void loadJar(Ruby runtime, boolean wrap) {
             try {
                 URL url;
-                if (location.startsWith(ClasspathResource.CLASSPATH)){
-                    // get URL directly from the classloader with its StreamHandler set
-                    // by the classloader itself
-                    url = ClasspathResource.getResourceURL(location);
-                }
-                else if (location.startsWith(URLResource.URI)){
+                if (location.startsWith(URLResource.URI)){
                     url = null;
                     runtime.getJRubyClassLoader().addURLNoIndex(URLResource.getResourceURL(runtime, location));
                 }

diff --git a/core/src/main/java/org/jruby/util/ClasspathResource.java b/core/src/main/java/org/jruby/util/ClasspathResource.java
diff --git a/core/src/main/java/org/jruby/util/JRubyFile.java b/core/src/main/java/org/jruby/util/JRubyFile.java
@@ -81,10 +81,8 @@ public static FileResource createResource(POSIX posix, Ruby runtime, String cwd,
         if (jarResource != null) return jarResource;
 
         if (pathname.contains(":")) { // scheme-oriented resources
-            if (pathname.startsWith("classpath:")) return ClasspathResource.create(pathname);
-
             // replace is needed for maven/jruby-complete/src/it/app_using_classpath_uri to work
-            if (pathname.startsWith("uri:")) return URLResource.create(runtime, pathname.replace("classpath:/", ""));
+            if (pathname.startsWith("uri:")) return URLResource.create(runtime, pathname);
 
             if (pathname.startsWith("file:")) {
                 pathname = pathname.substring(5);

diff --git a/maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java b/maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java
@@ -5,6 +5,8 @@
 import java.util.Arrays;
 import java.io.File;
 import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
 
 import org.jruby.embed.LocalContextScope;
 import org.jruby.embed.ScriptingContainer;
@@ -69,7 +71,7 @@ private void runIt(String index) throws Exception {
     private void runIt(String index, String script) throws Exception {
 	ClassLoader cl = Thread.currentThread().getContextClassLoader();
 	try {
-	    //Thread.currentThread().setContextClassLoader();
+	    Thread.currentThread().setContextClassLoader(new URLClassLoader( new URL[] {}, null ));
 	    System.err.println("\n\nrunning --------- " + index + "\n");
 	    ScriptingContainer container = newScriptingContainer();
 	    if (script != null) container.runScriptlet( script );