diff options
author | Zach Smith <zach@driver.xyz> | 2017-03-27 16:11:40 -0700 |
---|---|---|
committer | Zach Smith <zach@driver.xyz> | 2017-03-27 16:11:40 -0700 |
commit | cb1f773aeda5e93a69cce25f1e972bc29c3cb4b1 (patch) | |
tree | 93183464e303926bb34314cc0493875891ab4a71 /src/main/scala/xyz/driver/core/rest.scala | |
parent | 9b42e4381fe518a5fa40f68c3cad4fe83e2e4829 (diff) | |
download | driver-core-c2b12a819f355221419c48f5412a16a2dc1ac1d8.tar.gz driver-core-c2b12a819f355221419c48f5412a16a2dc1ac1d8.tar.bz2 driver-core-c2b12a819f355221419c48f5412a16a2dc1ac1d8.zip |
Revert "Hopefully fixing 504s"v0.10.37
This reverts commit a03bef1436774e8937a90df2927babc52608d150.
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 6 |
1 files 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) } } } |