Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e36e1e138916
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e63015b4e639
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 18, 2014

  1. Fix exponential expansion of work in method lookup

    @cheald
    cheald committed Nov 18, 2014
    Copy the full SHA
    e404bcb View commit details

Commits on Nov 19, 2014

  1. Merge pull request #2218 from cheald/fix_method_lookup_complexity 

    Fix exponential expansion of work in method lookup
    @enebo
    enebo committed Nov 19, 2014
    Copy the full SHA
    e63015b View commit details
Showing with 1 addition and 5 deletions.
  1. +1 −5 core/src/main/java/org/jruby/RubyModule.java
6 changes: 1 addition & 5 deletions core/src/main/java/org/jruby/RubyModule.java
View file
Original file line number Diff line number Diff line change
@@ -1190,11 +1190,7 @@ public DynamicMethod searchMethodInner(String name) {

// The local method resolution logic. Overridden in IncludedModuleWrapper for recursion.
protected DynamicMethod searchMethodCommon(String name) {
DynamicMethod method = getMethods().get(name);

if (method != null) return method;

return superClass == null ? null : superClass.searchMethodInner(name);
return getMethods().get(name);
}

public void invalidateCacheDescendants() {