archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8328316: Finisher cannot emit if stream is sequential and integrator returned false

Browse source 
Reviewed-by: psandoz
This commit is contained in:
Viktor Klang 2024-03-21 19:20:01 +00:00
parent ba05c6d0b6
commit ab28045d77
2 changed files with 71 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/share/classes/java/util/stream/GathererOp.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -142,6 +142,7 @@ final class GathererOp<T, A, R> extends ReferencePipeline<T, R> {
private final Integrator<A, T, R> integrator; // Optimization: reuse
private A state;
private boolean proceed = true;
private boolean downstreamProceed = true;
GatherSink(Gatherer<T, A, R> gatherer, Sink<R> sink) {
this.gatherer = gatherer;
@ -173,12 +174,12 @@ final class GathererOp<T, A, R> extends ReferencePipeline<T, R> {
@Override
public boolean cancellationRequested() {
return cancellationRequested(proceed);
return cancellationRequested(proceed && downstreamProceed);
}
private boolean cancellationRequested(boolean knownProceed) {
// Highly performance sensitive
return !(knownProceed && (!sink.cancellationRequested() || (proceed = false)));
return !(knownProceed && (!sink.cancellationRequested() || (downstreamProceed = false)));
}
@Override
@ -194,12 +195,12 @@ final class GathererOp<T, A, R> extends ReferencePipeline<T, R> {
@Override
public boolean isRejecting() {
return !proceed;
return !downstreamProceed;
}
@Override
public boolean push(R r) {
var p = proceed;
var p = downstreamProceed;
if (p)
sink.accept(r);
return !cancellationRequested(p);