Need to limit this search so we don't walk module-included modules.

jruby · Apr 17, 2015 · c725c69 · c725c69
1 parent 457a569
commit c725c69
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/IncludedModuleWrapper.java b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
@@ -208,7 +208,17 @@ public IRubyObject getAutoloadConstant(String name) {
 
     @Override
     protected DynamicMethod searchMethodCommon(String name) {
-        // try us and superclasses (from prepend)
-        return origin.searchMethodInner(name);
+        // IncludedModuleWrapper needs to search prepended modules too, but not included ones.
+        RubyModule module = this;
+        for (; module.isPrepended(); module = module.getSuperClass()) {
+            DynamicMethod method = module.getMethods().get(name);
+            if (method != null) return method.isNull() ? null : method;
+        }
+
+        // Last non-prepended module should be our regular module, do one last search.
+        DynamicMethod method = module.getMethods().get(name);
+        if (method != null) return method.isNull() ? null : method;
+
+        return null;
     }
 }