raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Handle null for StatusReply (#30728)

Browse source 
Fix specifically for Scala 2.12
This commit is contained in:
Justin Pihony 2021-10-07 11:46:31 -04:00 • committed by GitHub
parent 0ebbaffe9b
commit c034d20993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala
View file

@ -33,6 +33,13 @@ class StatusReplySpec extends AkkaSpec with ScalaFutures {
case _ => fail() case _ => fail()
} }
} }
"not throw exception if null" in {
(null: StatusReply[_]) match {
case StatusReply.Success(_) => fail()
case StatusReply.Error(_) => fail()
case _ =>
}
}
"pattern match error with text" in { "pattern match error with text" in {
StatusReply.Error("boho!") match { StatusReply.Error("boho!") match {
case StatusReply.Error(_) => case StatusReply.Error(_) =>

4
akka-actor/src/main/scala/akka/pattern/StatusReply.scala
View file

@ -118,7 +118,7 @@ object StatusReply {
*/ */
def apply[T](value: T): StatusReply[T] = new StatusReply(ScalaSuccess(value)) def apply[T](value: T): StatusReply[T] = new StatusReply(ScalaSuccess(value))
def unapply(status: StatusReply[Any]): Option[Any] = def unapply(status: StatusReply[Any]): Option[Any] =
if (status.isSuccess) Some(status.getValue) if (status != null && status.isSuccess) Some(status.getValue)
else None else None
} }
@ -150,7 +150,7 @@ object StatusReply {
*/ */
def apply[T](exception: Throwable): StatusReply[T] = new StatusReply(ScalaFailure(exception)) def apply[T](exception: Throwable): StatusReply[T] = new StatusReply(ScalaFailure(exception))
def unapply(status: StatusReply[_]): Option[Throwable] = def unapply(status: StatusReply[_]): Option[Throwable] =
if (status.isError) Some(status.getError) if (status != null && status.isError) Some(status.getError)
else None else None
} }