Base wrapper self on actual top self. Fixes #3609.

jruby · Jan 20, 2016 · 7be804e · 7be804e
1 parent e606af3
commit 7be804e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -2886,7 +2886,7 @@ public void printError(RubyException excp) {
     }
 
     public void loadFile(String scriptName, InputStream in, boolean wrap) {
-        IRubyObject self = wrap ? TopSelfFactory.createTopSelf(this, true) : getTopSelf();
+        IRubyObject self = wrap ? getTopSelf().rbClone() : getTopSelf();
         ThreadContext context = getCurrentContext();
         String file = context.getFile();
 
@@ -2897,7 +2897,9 @@ public void loadFile(String scriptName, InputStream in, boolean wrap) {
 
             if (wrap) {
                 // toss an anonymous module into the search path
-                ((RootNode) parseResult).getStaticScope().setModule(RubyModule.newModule(this));
+                RubyModule wrapper = RubyModule.newModule(this);
+                ((RubyBasicObject)self).extend(new IRubyObject[] {wrapper});
+                ((RootNode) parseResult).getStaticScope().setModule(wrapper);
             }
 
             runInterpreter(context, parseResult, self);