Unbreak the classpath: ScriptingContainer change.

jruby · Dec 5, 2014 · 5a4bcb2 · 5a4bcb2
1 parent 43051c5
commit 5a4bcb2
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/embed/internal/EmbedRubyRuntimeAdapterImpl.java b/core/src/main/java/org/jruby/embed/internal/EmbedRubyRuntimeAdapterImpl.java
@@ -129,12 +129,15 @@ public EmbedEvalUnit parse(PathType type, String filename, int... lines) {
                     break;
                 case CLASSPATH:
                     URL loc = container.getProvider().getRuntime().getJRubyClassLoader().getResource(filename);
-                    filename = LoadService.classpathFilenameFromURL(filename, loc, true);
-                    try {
-                        istream = loc.openStream();
-                    } catch (IOException ioe) {
-                        // should not happen
-                        throw new ParseFailedException(ioe);
+                    if (loc == null) {
+                        istream = null; // as in ClassLoader.getResourceAsStream
+                    } else {
+                        filename = LoadService.classpathFilenameFromURL(filename, loc, true);
+                        try {
+                            istream = loc.openStream();
+                        } catch (IOException ioe) {
+                            istream = null; // as in getClassLoader.getResourceAsStream
+                        }
                     }
                     break;
             }