Fix Enumerable#max_by with nil

jruby · Dec 14, 2015 · 25a3876 · 25a3876
1 parent 1711278
commit 25a3876
Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyEnumerable.java b/core/src/main/java/org/jruby/RubyEnumerable.java
@@ -1201,6 +1201,7 @@ public static IRubyObject max_by(ThreadContext context, IRubyObject self, final
 
     @JRubyMethod
     public static IRubyObject max_by(ThreadContext context, IRubyObject self, IRubyObject arg, final Block block) {
+        if (arg == context.nil) return singleExtentBy(context, self, "max", SORT_MAX, block);
         // TODO: Replace with an implementation (quickselect, etc) which requires O(k) memory rather than O(n) memory
         RubyArray sorted = (RubyArray)sort_by(context, self, block);
         return ((RubyArray) sorted.last(arg)).reverse();

diff --git a/spec/tags/ruby/core/enumerable/max_by_tags.txt b/spec/tags/ruby/core/enumerable/max_by_tags.txt
@@ -1,2 +1 @@
 fails:Enumerable#max_by when called with an argument n without a block returns an enumerator
-fails:Enumerable#max_by when called with an argument n when n is nil returns the maximum element
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Enumerable#max_by when called with an argument n without a block returns an enumerator
		fails:Enumerable#max_by when called with an argument n when n is nil returns the maximum element