Delays UnboundMethod class creation.

jruby · Jul 20, 2012 · ae1a887 · ae1a887
1 parent 91c08bb
commit ae1a887
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/org/jruby/Ruby.java b/src/org/jruby/Ruby.java
@@ -1289,9 +1289,6 @@ private void initCore() {
 
         processModule = getProcess();
 
-        if (profile.allowClass("UnboundMethod")) {
-            RubyUnboundMethod.defineUnboundMethodClass(this);
-        }
         if (profile.allowModule("Signal")) {
             RubySignal.createSignal(this);
         }
@@ -1375,6 +1372,7 @@ private void initClassCreatorMap() {
             classCreatorMap.put("Stat", this.getClass().getMethod("getFileStat"));
             classCreatorMap.put("Process", this.getClass().getMethod("getProcess"));
             classCreatorMap.put("Time", this.getClass().getMethod("getTime"));
+            classCreatorMap.put("UnboundMethod", this.getClass().getMethod("getUnboundMethod"));
 
             classCreatorMap.put("Encoding", this.getClass().getMethod("getEncoding"));
 
@@ -1912,11 +1910,11 @@ public RubyClass getMethod() {
     }  
 
     public RubyClass getUnboundMethod() {
+        if (unboundMethodClass == null && profile.allowClass("UnboundMethod")) {
+            unboundMethodClass = RubyUnboundMethod.defineUnboundMethodClass(this);
+        }
         return unboundMethodClass;
-    }
-    void setUnboundMethod(RubyClass unboundMethodClass) {
-        this.unboundMethodClass = unboundMethodClass;
-    }    
+    }   
 
     public RubyClass getMatchData() {
         if (matchDataClass == null && profile.allowClass("MatchData")) {

diff --git a/src/org/jruby/RubyUnboundMethod.java b/src/org/jruby/RubyUnboundMethod.java
@@ -67,11 +67,10 @@ public static RubyUnboundMethod newUnboundMethod(
         return newMethod;
     }
 
-    public static RubyClass defineUnboundMethodClass(Ruby runtime) {
+    static RubyClass defineUnboundMethodClass(Ruby runtime) {
         // TODO: NOT_ALLOCATABLE_ALLOCATOR is probably ok here. Confirm. JRUBY-415
         RubyClass newClass = 
         	runtime.defineClass("UnboundMethod", runtime.getMethod(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
-        runtime.setUnboundMethod(newClass);
 
         newClass.index = ClassIndex.UNBOUNDMETHOD;
         newClass.setReifiedClass(RubyUnboundMethod.class);