From 9ac594e63767fc4ed86f2933d912fc4b7b59a1ec Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Mon, 4 Apr 2022 15:43:53 +0200 Subject: [PATCH] stream: don't wrap exceptions in ByteStringParser (#31311) --- .../test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala | 4 +--- .../src/main/scala/akka/stream/impl/io/ByteStringParser.scala | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala index cc5d2c26ad..315d4d4220 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala @@ -7,7 +7,6 @@ package tcp import scala.util.Random -import akka.stream.impl.io.ByteStringParser.ParsingException import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Framing.FramingException import akka.stream.scaladsl.Sink @@ -62,8 +61,7 @@ class TcpFramingSpec extends AkkaSpec(""" "reject invalid magic" in { val bytes = frameBytes(2) val fail = Source(List(bytes)).via(framingFlow).runWith(Sink.seq).failed.futureValue - fail shouldBe a[ParsingException] - fail.getCause shouldBe a[FramingException] + fail shouldBe a[FramingException] } "include streamId in each frame" in { diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala b/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala index b5c498677a..42b456c62b 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala @@ -80,7 +80,7 @@ import akka.util.ByteString DontRecurse case NonFatal(ex) => - failStage(new ParsingException(s"Parsing failed in step $current", ex)) + failStage(ex) DontRecurse } @@ -177,6 +177,7 @@ import akka.util.ByteString throw new IllegalStateException("no initial parser installed: you must use startWith(...)") } + @deprecated("Deprecated for internal usage. Will not be emitted any more.", "2.6.20") class ParsingException(msg: String, cause: Throwable) extends RuntimeException(msg, cause) val NeedMoreData = new Exception with NoStackTrace