Merge branch 'master' into okhttp3-monix

# Conflicts:
#	okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala

1 files changed, 5 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 af896d4..2090e02 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
@@ -90,6 +90,8 @@ abstract class OkHttpClientHandler[R[_], S](client: OkHttpClient)
           case ResponseAsByteArray => Try(res.body().bytes())
           case ras @ ResponseAsStream() =>
             responseBodyToStream(res).map(ras.responseIsStream)
+          case ResponseAsFile(file, overwrite) =>
+            Try(ResponseAs.saveFile(file, res.body().byteStream(), overwrite))
         }
     }
 
@@ -131,9 +133,10 @@ abstract class OkHttpAsyncClientHandler[R[_], S](client: OkHttpClient,
         .enqueue(new Callback {
           override def onFailure(call: Call, e: IOException): Unit =
             error(e)
-
+          
           override def onResponse(call: Call, response: OkHttpResponse): Unit =
-            success(readResponse(response, r.responseAs))
+            try success(readResponse(response, r.responseAs))
+            catch { case e: Exception => error(e) }
         })
     })
   }