Skip to content

revert recent changes to recoverWith #2675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjfanning wants to merge 1 commit into
base: 1.5.x
Choose a base branch
from
+7 −31
Open

revert recent changes to recoverWith #2675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 7 additions & 31 deletions stream/src/main/scala/org/apache/pekko/stream/impl/fusing/Ops.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,9 @@ import pekko.stream.Attributes.{ InputBuffer, LogLevels }
import pekko.stream.Attributes.SourceLocation
import pekko.stream.OverflowStrategies._
import pekko.stream.Supervision.Decider
import pekko.stream.impl.{
Buffer => BufferImpl,
ContextPropagation,
FailedSource,
JavaStreamSource,
ReactiveStreamsCompliance,
TraversalBuilder
}
import pekko.stream.impl.{ Buffer => BufferImpl, ContextPropagation, ReactiveStreamsCompliance, TraversalBuilder }
import pekko.stream.impl.Stages.DefaultAttributes
import pekko.stream.impl.fusing.GraphStages.{ FutureSource, SimpleLinearGraphStage, SingleSource }
import pekko.stream.impl.fusing.GraphStages.SimpleLinearGraphStage
import pekko.stream.scaladsl.{
DelayStrategy,
Source,
Expand Down Expand Up @@ -2183,36 +2176,19 @@ private[pekko] object TakeWithin {
override def onPull(): Unit = pull(in)

@nowarn("msg=Any")
@tailrec
def onFailure(ex: Throwable): Unit = {
import Collect.NotApplied
if (maximumRetries < 0 || attempt < maximumRetries) {
pf.applyOrElse(ex, NotApplied) match {
case _: NotApplied.type => failStage(ex)
case source: Graph[SourceShape[T] @unchecked, M @unchecked] if TraversalBuilder.isEmptySource(source) =>
completeStage()
case source: Graph[SourceShape[T] @unchecked, M @unchecked] =>
TraversalBuilder.getValuePresentedSource(source) match {
case OptionVal.Some(graph) => graph match {
case singleSource: SingleSource[T @unchecked] => emit(out, singleSource.elem, () => completeStage())
case failed: FailedSource[T @unchecked] => onFailure(failed.failure)
case futureSource: FutureSource[T @unchecked] => futureSource.future.value match {
case Some(Success(elem)) => emit(out, elem, () => completeStage())
case Some(Failure(ex)) => onFailure(ex)
case None =>
switchTo(source)
attempt += 1
}
case iterableSource: IterableSource[T @unchecked] =>
emitMultiple(out, iterableSource.elements, () => completeStage())
case javaStreamSource: JavaStreamSource[T @unchecked, _] =>
emitMultiple(out, javaStreamSource.open().spliterator(), () => completeStage())
case _ =>
switchTo(source)
attempt += 1
}
case other: Graph[SourceShape[T] @unchecked, M @unchecked] =>
TraversalBuilder.getSingleSource(other) match {
case OptionVal.Some(singleSource) =>
emit(out, singleSource.elem.asInstanceOf[T], () => completeStage())
case _ =>
switchTo(source)
switchTo(other)
attempt += 1
}
case _ => throw new IllegalStateException() // won't happen, compiler exhaustiveness check pleaser
Expand Down
Loading