Simplify setupLoader and remove temporary field.

jruby · Feb 8, 2015 · 290e3f1 · 290e3f1
1 parent f7b72f0
commit 290e3f1
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -1407,7 +1407,15 @@ public void setProfilingService( String service )  {
     }
 
     private static ClassLoader setupLoader() {
-        return RubyInstanceConfig.class.getClassLoader();
+        ClassLoader loader = RubyInstanceConfig.class.getClassLoader();
+
+        // loader can be null for example when jruby comes from the boot-classLoader
+
+        if (loader == null) {
+            loader = Thread.currentThread().getContextClassLoader();
+        }
+
+        return loader;
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -1454,9 +1462,11 @@ private static ClassLoader setupLoader() {
     private ProfileOutput profileOutput = new ProfileOutput(System.err);
     private String profilingService;
 
-    private ClassLoader thisLoader = setupLoader();
-    // thisLoader can be null for example when jruby comes from the boot-classLoader
-    private ClassLoader loader = thisLoader == null ? Thread.currentThread().getContextClassLoader() : thisLoader;
+    private ClassLoader loader = setupLoader();
+
+    public ClassLoader getCurrentThreadClassLoader() {
+        return Thread.currentThread().getContextClassLoader();
+    }
 
     // from CommandlineParser
     private List<String> loadPaths = new ArrayList<String>();