Merge pull request jruby#3073 from jruby/test-dir-globs-on-uri-classl…

…oader dir globs on uri classloader without the need of .jrubydir
enebo · Jul 6, 2015 · 5b411a2 · 5b411a2
2 parents 026b0d9 + 8106cc4
commit 5b411a2
Show file tree

Hide file tree

Showing 14 changed files with 135 additions and 389 deletions.
diff --git a/core/src/main/java/org/jruby/embed/osgi/internal/OSGiLoadService.java b/core/src/main/java/org/jruby/embed/osgi/internal/OSGiLoadService.java
@@ -63,7 +63,18 @@ public OSGiLoadService(Ruby runtime) {
         super(runtime);
 //        super.searchers.add(new OSGiBundlesSearcher());
     }
-
+
+    protected Library findLibraryBySearchState(SearchState state) {
+        Library library = super.findLibraryBySearchState(state);
+        if (library == null){
+            library = findLibraryWithClassloaders(state, state.searchFile, state.suffixType);
+            if (library != null) {
+                state.library = library;
+            }
+        }
+        return library;
+    }
+
     /**
      * Support for 'bundle:/' to look for libraries in osgi bundles
      * or classes or ruby files.

diff --git a/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java b/core/src/main/java/org/jruby/runtime/load/LibrarySearcher.java
@@ -292,9 +292,10 @@ public void load(Ruby runtime, boolean wrap) {
             try {
                 URL url;
                 if (location.startsWith(URLResource.URI)) {
-                    url = null;
-                    runtime.getJRubyClassLoader().addURLNoIndex(URLResource.getResourceURL(runtime, location));
+                    url = URLResource.getResourceURL(runtime, location);
                 } else {
+                    // convert file urls with !/ into jar urls so the classloader
+                    // can handle them via protocol handler
                     File f = new File(location);
                     if (f.exists() || location.contains( "!")){
                         url = f.toURI().toURL();
@@ -305,9 +306,7 @@ public void load(Ruby runtime, boolean wrap) {
                         url = new URL(location);
                     }
                 }
-                if (url != null) {
-                    runtime.getJRubyClassLoader().addURL(url);
-                }
+                runtime.getJRubyClassLoader().addURL(url);
             } catch (MalformedURLException badUrl) {
                 runtime.newIOErrorFromException(badUrl);
             }

diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
@@ -966,18 +966,12 @@ protected void debugLogFound( LoadServiceResource resource ) {
         }
     }
 
-    private Library findLibraryBySearchState(SearchState state) {
+    protected Library findLibraryBySearchState(SearchState state) {
         if (librarySearcher.findBySearchState(state) != null) {
             // findBySearchState should fill the state already
             return state.library;
         }
-
-        // TODO(ratnikov): Remove the special classpath case by introducing a classpath file resource
-        Library library = findLibraryWithClassloaders(state, state.searchFile, state.suffixType);
-        if (library != null) {
-            state.library = library;
-        }
-        return library;
+        return null;
     }
 
     @Deprecated

diff --git a/core/src/main/java/org/jruby/util/CompoundJarURLStreamHandler.java b/core/src/main/java/org/jruby/util/CompoundJarURLStreamHandler.java