Revert "putting the jruby-classloader as context classloader means th…

…at all attached "jars" can be found via" This reverts commit ff10216. Conflicts: test/jruby/test_context_classloader.rb
jruby · Jul 16, 2015 · 7d3bc47 · 7d3bc47
1 parent a3f452f
commit 7d3bc47
Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/Main.java b/core/src/main/java/org/jruby/Main.java
@@ -282,6 +282,8 @@ public void run() {
         }
 
         try {
+            doSetContextClassLoader(runtime);
+
             if (in == null) {
                 // no script to run, return success
                 return new Status();
@@ -450,6 +452,18 @@ 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));
     }

diff --git a/spec/java_integration/reify/become_java_spec.rb b/spec/java_integration/reify/become_java_spec.rb
@@ -112,10 +112,8 @@ def blah_with_args(arg_one,arg_two)
     class JRUBY5564; end
     a_class = JRUBY5564.become_java!(false)
 
-    # 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
+    # load the java class from the classloader
+    cl = java.lang.Thread.current_thread.getContextClassLoader
     cl.load_class(a_class.get_name).should == a_class
   end
 

diff --git a/test/jruby/test_context_classloader.rb b/test/jruby/test_context_classloader.rb
@@ -12,7 +12,10 @@ def setup
   end
 
   def test_main_thread
-    assert_equal(JRuby.runtime.jruby_class_loader.parent, org.jruby.Ruby.java_class.class_loader || java.lang.Thread.current_thread.context_class_loader)
+    # 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)"'))
   end
 
   def test_ruby_thread