From 30ff7866eef2e7c407b486f1e05179aaeb12dcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kaczor?= Date: Mon, 4 Apr 2022 15:36:42 +0200 Subject: [PATCH] Fix StreamRefSerializer.serializeRemoteSinkFailure throwing NPE (#31307) --- .../akka/stream/serialization/StreamRefSerializer.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala index 060d3bdb36..0d3692f8a7 100644 --- a/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala +++ b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala @@ -91,7 +91,10 @@ private[akka] final class StreamRefSerializer(val system: ExtendedActorSystem) d: StreamRefsProtocol.RemoteStreamFailure): StreamRefMessages.RemoteStreamFailure = { StreamRefMessages.RemoteStreamFailure .newBuilder() - .setCause(UnsafeByteOperations.unsafeWrap(d.msg.getBytes(StandardCharsets.UTF_8))) + .setCause { + val msg = Option(d.msg).getOrElse(d.getClass.getName) + UnsafeByteOperations.unsafeWrap(msg.getBytes(StandardCharsets.UTF_8)) + } .build() }