aboutsummaryrefslogtreecommitdiff
path: root/okhttp-client-handler/src
diff options
context:
space:
mode:
authoradamw <adam@warski.org>2017-08-03 14:29:33 +0200
committeradamw <adam@warski.org>2017-08-03 14:29:33 +0200
commit4fb65e25f528cb29a16d575fef7ecfd79c6b9fb9 (patch)
tree423b1966864dc5141b78fa5e425589e0109293d9 /okhttp-client-handler/src
parentc07f98349ac5dc646855d00425a9dc2c3324465e (diff)
downloadsttp-4fb65e25f528cb29a16d575fef7ecfd79c6b9fb9.tar.gz
sttp-4fb65e25f528cb29a16d575fef7ecfd79c6b9fb9.tar.bz2
sttp-4fb65e25f528cb29a16d575fef7ecfd79c6b9fb9.zip
Fix 2.11 compile
Diffstat (limited to 'okhttp-client-handler/src')
-rw-r--r--okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
index b18fdbb..cb1103b 100644
--- a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
+++ b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
@@ -87,7 +87,9 @@ abstract class OkHttpClientHandler[R[_], S](client: OkHttpClient)
case ResponseAsByteArray => responseMonad.unit(res.body().bytes())
case MappedResponseAs(raw, g) =>
responseMonad.map(readResponseBody(res, raw), g)
- case ResponseAsStream() => responseMonad.error(new IllegalStateException("Streaming isn't supported"))
+ case ResponseAsStream() =>
+ responseMonad.error(
+ new IllegalStateException("Streaming isn't supported"))
}
}
}
@@ -127,7 +129,7 @@ class OkHttpFutureClientHandler private (client: OkHttpClient)(
promise.success(readResponse(response, r.responseAs))
})
- promise.future.flatten
+ responseMonad.flatten(promise.future)
}
override def responseMonad: MonadError[Future] = new FutureMonad