putting the jruby-classloader as context classloader means that all a…

…ttached "jars" can be found via

the Thread.currentThread.contextClassLoader. running jruby from other environments like servlets just
leave the context classloader as is. so this was a commandline only feature.

finally it keeps the classloader semantic uniform wether executed from commandline or inside a j2ee container
or osgi framework or embedded jruby in a java application

core/src/main/java/org/jruby/Main.java

@@ -283,8 +283,6 @@ public void run() {
         }
 
         try {
-            doSetContextClassLoader(runtime);
-
             if (in == null) {
                 // no script to run, return success
                 return new Status();
@@ -454,18 +452,6 @@ private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename)
         }
     }
 
-    private void doSetContextClassLoader(Ruby runtime) {
-        // set thread context JRuby classloader here, for the main thread
-        try {
-            Thread.currentThread().setContextClassLoader(runtime.getJRubyClassLoader());
-        } catch (SecurityException se) {
-            // can't set TC classloader
-            if (runtime.getInstanceConfig().isVerbose()) {
-                config.getError().println("WARNING: Security restrictions disallowed setting context classloader for main thread.");
-            }
-        }
-    }
-
     private void doProcessArguments(InputStream in) {
         config.processArguments(config.parseShebangOptions(in));
     }

spec/java_integration/reify/become_java_spec.rb

@@ -112,8 +112,10 @@ def blah_with_args(arg_one,arg_two)
     class JRUBY5564; end
     a_class = JRUBY5564.become_java!(false)
 
-    # load the java class from the classloader
-    cl = java.lang.Thread.current_thread.getContextClassLoader
+    # load the java class from the jruby-classloader
+    # this diverts from the original issue 5564 since
+    # JRuby can run without any context_class_loader involved
+    cl = JRuby.runtime.jruby_class_loader
     cl.load_class(a_class.get_name).should == a_class
   end
 

test/jruby/test_context_classloader.rb

@@ -12,10 +12,7 @@ def setup
   end
 
   def test_main_thread
-    # This launches externally because our test run doesn't call through Main,
-    # so the executing thread's context classloader is not set to JRuby's.
-    assert_equal("true\n",
-      jruby('-rjava -rjruby -e "p(JRuby.runtime.jruby_class_loader == java.lang.Thread.current_thread.context_class_loader)"'))
+    assert_equal(JRuby.runtime.jruby_class_loader.parent, java.lang.Thread.current_thread.context_class_loader)
   end
 
   def test_ruby_thread