aboutsummaryrefslogtreecommitdiff
path: root/src/share/classes/java/util/stream
diff options
context:
space:
mode:
authorpsandoz <none@none>2013-07-30 11:32:26 +0100
committerpsandoz <none@none>2013-07-30 11:32:26 +0100
commitee24e3587c8159aa4db983ce373682ee9c7d26aa (patch)
tree9ce893cc8fb857816fd04e821fb88572bad32e98 /src/share/classes/java/util/stream
parent27b6066a161ef2d5d567333af8dfa0f98bb2186d (diff)
downloadjdk8u_jdk-ee24e3587c8159aa4db983ce373682ee9c7d26aa.tar.gz
8021863: Stream.concat incorrectly calculates unsized state
Reviewed-by: chegar
Diffstat (limited to 'src/share/classes/java/util/stream')
-rw-r--r--src/share/classes/java/util/stream/Streams.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/share/classes/java/util/stream/Streams.java b/src/share/classes/java/util/stream/Streams.java
index 7bf3123af6..fe83b9708d 100644
--- a/src/share/classes/java/util/stream/Streams.java
+++ b/src/share/classes/java/util/stream/Streams.java
@@ -681,11 +681,9 @@ final class Streams {
this.aSpliterator = aSpliterator;
this.bSpliterator = bSpliterator;
beforeSplit = true;
- // The spliterator is unsized before splitting if a and b are
- // sized and the sum of the estimates overflows
- unsized = aSpliterator.hasCharacteristics(SIZED)
- && aSpliterator.hasCharacteristics(SIZED)
- && aSpliterator.estimateSize() + bSpliterator.estimateSize() < 0;
+ // The spliterator is known to be unsized before splitting if the
+ // sum of the estimates overflows.
+ unsized = aSpliterator.estimateSize() + bSpliterator.estimateSize() < 0;
}
@Override