From 45d26c95711c9e57c51394ceeb10fd69d320c62a Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Tue, 3 Sep 2013 11:44:34 -0700
Subject: [PATCH] 8024178: Difference in Stream.collect(Collector) methods
 located in jdk8 and jdk8-lambda repos

Reviewed-by: mduigou
---
 jdk/src/share/classes/java/util/stream/DelegatingStream.java  | 2 +-
 jdk/src/share/classes/java/util/stream/ReferencePipeline.java | 2 +-
 jdk/src/share/classes/java/util/stream/Stream.java            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdk/src/share/classes/java/util/stream/DelegatingStream.java b/jdk/src/share/classes/java/util/stream/DelegatingStream.java
index 2dab1a4430c..fbe7735a515 100644
--- a/jdk/src/share/classes/java/util/stream/DelegatingStream.java
+++ b/jdk/src/share/classes/java/util/stream/DelegatingStream.java
@@ -209,7 +209,7 @@ public class DelegatingStream<T> implements Stream<T> {
     }
 
     @Override
-    public <R, A> R collect(Collector<? super T, A, ? extends R> collector) {
+    public <R, A> R collect(Collector<? super T, A, R> collector) {
         return delegate.collect(collector);
     }
 
diff --git a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
index 1fffff48b18..6c6fe647ee9 100644
--- a/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
+++ b/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
@@ -493,7 +493,7 @@ abstract class ReferencePipeline<P_IN, P_OUT>
 
     @Override
     @SuppressWarnings("unchecked")
-    public final <R, A> R collect(Collector<? super P_OUT, A, ? extends R> collector) {
+    public final <R, A> R collect(Collector<? super P_OUT, A, R> collector) {
         A container;
         if (isParallel()
                 && (collector.characteristics().contains(Collector.Characteristics.CONCURRENT))
diff --git a/jdk/src/share/classes/java/util/stream/Stream.java b/jdk/src/share/classes/java/util/stream/Stream.java
index 59d703b118e..1071b20110e 100644
--- a/jdk/src/share/classes/java/util/stream/Stream.java
+++ b/jdk/src/share/classes/java/util/stream/Stream.java
@@ -657,7 +657,7 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> {
      * @see #collect(Supplier, BiConsumer, BiConsumer)
      * @see Collectors
      */
-    <R, A> R collect(Collector<? super T, A, ? extends R> collector);
+    <R, A> R collect(Collector<? super T, A, R> collector);
 
     /**
      * Returns the minimum element of this stream according to the provided