detect the right root classloader for more cases

jruby · Oct 6, 2014 · afeea6d · afeea6d
1 parent e09f484
commit afeea6d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -1413,8 +1413,8 @@ public void setProfilingService( String service )  {
     private ProfileOutput profileOutput = new ProfileOutput(System.err);
     private String profilingService;
 
-    private ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
-    private ClassLoader loader = contextLoader == null ? RubyInstanceConfig.class.getClassLoader() : contextLoader;
+    private ClassLoader thisLoader = RubyInstanceConfig.class.getClassLoader();
+    private ClassLoader loader = thisLoader == null ? Thread.currentThread().getContextClassLoader() : thisLoader;
 
     // from CommandlineParser
     private List<String> loadPaths = new ArrayList<String>();