From cb1f773aeda5e93a69cce25f1e972bc29c3cb4b1 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Mon, 27 Mar 2017 16:11:40 -0700 Subject: Revert "Hopefully fixing 504s" This reverts commit a03bef1436774e8937a90df2927babc52608d150. --- src/main/scala/xyz/driver/core/rest.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index 639eb05..aa2a75e 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -5,6 +5,7 @@ import akka.http.scaladsl.Http import akka.http.scaladsl.model._ import akka.http.scaladsl.model.headers.{HttpChallenges, RawHeader} import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected +import akka.http.scaladsl.server.Directive0 import akka.http.scaladsl.unmarshalling.Unmarshal import akka.http.scaladsl.unmarshalling.Unmarshaller import akka.stream.ActorMaterializer @@ -296,10 +297,7 @@ package rest { } else if (response.status.isFailure()) { throw new Exception(s"Http status is failure ${response.status}") } else { - val entity = response.entity - // See https://github.com/akka/akka/issues/19538 - entity.toStrict(5000L, materializer) - Unmarshal(entity) + Unmarshal(response.entity) } } } -- cgit v1.2.3