Use JRuby's parent classloader rather than JRubyClassLoader for startup.

ashanbrown · Jan 4, 2012 · 4dc6d33 · 4dc6d33
1 parent 12f02ae
commit 4dc6d33
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1510,12 +1510,12 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
 
         if(is1_9()) {
             // see ruby.c's ruby_init_gems function
-            loadFile("builtin/prelude.rb", getJRubyClassLoader().getResourceAsStream("builtin/prelude.rb"), false);
+            loadFile("builtin/prelude.rb", getClassLoader().getResourceAsStream("builtin/prelude.rb"), false);
             if (!config.isDisableGems()) {
                 // NOTE: This has been disabled because gem_prelude is terribly broken.
                 //       We just require 'rubygems' in gem_prelude, at least for now.
                 //defineModule("Gem"); // dummy Gem module for prelude
-                loadFile("builtin/gem_prelude.rb", getJRubyClassLoader().getResourceAsStream("builtin/gem_prelude.rb"), false);
+                loadFile("builtin/gem_prelude.rb", getClassLoader().getResourceAsStream("builtin/gem_prelude.rb"), false);
             }
         }