Fix classpath: load path entries to properly do a classloader search.

Conflicts: src/org/jruby/runtime/load/LoadService.java
ashanbrown · Feb 8, 2012 · 4914cfe · 4914cfe
1 parent 93fdfcd
commit 4914cfe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/bin/rdoc b/bin/rdoc
@@ -1,4 +1,4 @@
-#!/Users/headius/projects/jruby/bin/jruby
+#!/usr/bin/env jruby
 #
 # This file was generated by RubyGems.
 #

diff --git a/bin/ri b/bin/ri
@@ -1,4 +1,4 @@
-#!/Users/headius/projects/jruby/bin/jruby
+#!/usr/bin/env jruby
 #
 # This file was generated by RubyGems.
 #

diff --git a/src/org/jruby/runtime/load/LoadService.java b/src/org/jruby/runtime/load/LoadService.java
@@ -1061,11 +1061,14 @@ protected LoadServiceResource tryResourceFromLoadPathOrURL(SearchState state, St
                 }
             } else {
                 boolean looksLikeJarURL = loadPathLooksLikeJarURL(loadPathEntry);
+                boolean looksLikeClasspathURL = loadPathLooksLikeClasspathURL(loadPathEntry);
                 for (String suffix : suffixType.getSuffixes()) {
                     String namePlusSuffix = baseName + suffix;
 
                     if (looksLikeJarURL) {
                         foundResource = tryResourceFromJarURLWithLoadPath(namePlusSuffix, loadPathEntry);
+                    } else if (looksLikeClasspathURL) {
+                        foundResource = findFileInClasspath(loadPathEntry + "/" + namePlusSuffix);
                     } else {
                         foundResource = tryResourceFromLoadPath(namePlusSuffix, loadPathEntry);
                     }
@@ -1139,6 +1142,10 @@ protected boolean loadPathLooksLikeJarURL(String loadPathEntry) {
         return loadPathEntry.startsWith("jar:") || loadPathEntry.endsWith(".jar") || (loadPathEntry.startsWith("file:") && loadPathEntry.indexOf("!/") != -1);
     }
 
+    protected boolean loadPathLooksLikeClasspathURL(String loadPathEntry) {
+        return loadPathEntry.startsWith("classpath:");
+    }
+
     protected LoadServiceResource tryResourceFromLoadPath( String namePlusSuffix,String loadPathEntry) throws RaiseException {
         LoadServiceResource foundResource = null;