remove useless initial load path entries of the ScriptingContainer

jruby · Oct 16, 2014 · 074bbfc · 074bbfc
1 parent 3388591
commit 074bbfc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -252,8 +252,6 @@ private LocalContextProvider getProviderInstance(LocalContextScope scope, LocalV
     }
 
     private void initConfig() throws URISyntaxException, UnsupportedEncodingException {
-        List<String> paths = SystemPropertyCatcher.findLoadPaths();
-        provider.getRubyInstanceConfig().setLoadPaths(paths);
         String home = SystemPropertyCatcher.findJRubyHome(this);
         if (home != null) {
         	provider.getRubyInstanceConfig().setJRubyHome(home);

diff --git a/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java b/core/src/test/java/org/jruby/embed/ScriptingContainerTest.java
@@ -1550,9 +1550,9 @@ public void testGetLoadPaths() {
         instance.setOutput(pstream);
         instance.setWriter(writer);
         instance.setErrorWriter(writer);
-        List result = instance.getLoadPaths();
+        List<String> result = instance.getLoadPaths();
         assertTrue(result != null);
-        assertTrue(result.size() > 0);
+        assertTrue(result.size() == 0);
 
         instance = null;
     }
@@ -2630,4 +2630,14 @@ public void testExitTerminatesScript() {
         Object result = instance.runScriptlet("exit 1234");
         assertEquals(1234L, result);
     }
+
+    @Test
+    public void testLoadPathOfScriptingContainer() {
+        ScriptingContainer instance = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
+        // note that instance.getLoadPath is not the load-path of the runtime !!!
+        String[] results = instance.runScriptlet("$LOAD_PATH").toString().split(", ");
+        for(String result : results){
+            assertTrue(result + " containt lib/ruby/", result.contains("lib/ruby/"));
+        }
+    }
 }