From c636f3540fa93c19e6d5503fb1cdfea878010fad Mon Sep 17 00:00:00 2001 From: Richard Imaoka Date: Tue, 27 Jun 2017 21:32:53 +0900 Subject: [PATCH] Correct the backpressure API comment for throttle (Fixes #22791) (#23225) --- akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala | 4 ++-- akka-stream/src/main/scala/akka/stream/javadsl/Source.scala | 4 ++-- akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala | 4 ++-- .../src/main/scala/akka/stream/javadsl/SubSource.scala | 4 ++-- akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala index 3dacf70e17..c294abf16f 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -1926,7 +1926,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * @@ -1956,7 +1956,7 @@ final class Flow[-In, +Out, +Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index 72d5885060..d3adfa1d0e 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -2073,7 +2073,7 @@ final class Source[+Out, +Mat](delegate: scaladsl.Source[Out, Mat]) extends Grap * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * @@ -2103,7 +2103,7 @@ final class Source[+Out, +Mat](delegate: scaladsl.Source[Out, Mat]) extends Grap * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala index cb5bd94418..8a4dfec486 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala @@ -1315,7 +1315,7 @@ class SubFlow[-In, +Out, +Mat](delegate: scaladsl.SubFlow[Out, Mat, scaladsl.Flo * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * @@ -1352,7 +1352,7 @@ class SubFlow[-In, +Out, +Mat](delegate: scaladsl.SubFlow[Out, Mat, scaladsl.Flo * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala index f9037a83a8..a5aa1897ff 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala @@ -1310,7 +1310,7 @@ class SubSource[+Out, +Mat](delegate: scaladsl.SubFlow[Out, Mat, scaladsl.Source * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * @@ -1340,7 +1340,7 @@ class SubSource[+Out, +Mat](delegate: scaladsl.SubFlow[Out, Mat, scaladsl.Source * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala index 3c07d6e448..9b263008f4 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala @@ -1699,7 +1699,7 @@ trait FlowOps[+Out, +Mat] { * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes * @@ -1735,7 +1735,7 @@ trait FlowOps[+Out, +Mat] { * * '''Emits when''' upstream emits an element and configured time per each element elapsed * - * '''Backpressures when''' downstream backpressures + * '''Backpressures when''' downstream backpressures or the incoming rate is higher than the speed limit * * '''Completes when''' upstream completes *