stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8024178: Difference in Stream.collect(Collector) methods located in jdk8 and jdk8-lambda repos

Browse Source 
Reviewed-by: mduigou
This commit is contained in:
Henry Jen 2013-09-03 11:44:34 -07:00
parent f7b61b93f1
commit 45d26c9571
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/java/util/stream/DelegatingStream.java
View File

@ -209,7 +209,7 @@ public class DelegatingStream<T> implements Stream<T> {
} }
@Override @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); return delegate.collect(collector);
} }

2
jdk/src/share/classes/java/util/stream/ReferencePipeline.java
View File

@ -493,7 +493,7 @@ abstract class ReferencePipeline<P_IN, P_OUT>
@Override @Override
@SuppressWarnings("unchecked") @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; A container;
if (isParallel() if (isParallel()
&& (collector.characteristics().contains(Collector.Characteristics.CONCURRENT)) && (collector.characteristics().contains(Collector.Characteristics.CONCURRENT))

2
jdk/src/share/classes/java/util/stream/Stream.java
View File

@ -657,7 +657,7 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> {
* @see #collect(Supplier, BiConsumer, BiConsumer) * @see #collect(Supplier, BiConsumer, BiConsumer)
* @see Collectors * @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 * Returns the minimum element of this stream according to the provided