Eliminate unreachable code warning

ktorio · Oct 12, 2018 · 9861ea5 · 9861ea5
1 parent fa609bc
commit 9861ea5
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/ktor-client/ktor-client-core/src/io/ktor/client/features/HttpRedirect.kt b/ktor-client/ktor-client-core/src/io/ktor/client/features/HttpRedirect.kt
@@ -20,20 +20,23 @@ class HttpRedirect {
 
         override fun install(feature: HttpRedirect, scope: HttpClient) {
             scope.feature(HttpSend)!!.intercept { origin ->
-                if (!origin.response.status.isRedirect()) return@intercept origin
+                handleCall(origin)
+            }
+        }
+
+        private suspend fun Sender.handleCall(origin: HttpClientCall): HttpClientCall {
+            if (!origin.response.status.isRedirect()) return origin
 
-                var call = origin
-                while (true) {
-                    val location = call.response.headers[HttpHeaders.Location]
+            var call = origin
+            while (true) {
+                val location = call.response.headers[HttpHeaders.Location]
 
-                    call = execute(HttpRequestBuilder().apply {
-                        takeFrom(origin.request)
-                        location?.let { url.takeFrom(it) }
-                    })
+                call = execute(HttpRequestBuilder().apply {
+                    takeFrom(origin.request)
+                    location?.let { url.takeFrom(it) }
+                })
 
-                    if (!call.response.status.isRedirect()) return@intercept call
-                }
-                return@intercept call
+                if (!call.response.status.isRedirect()) return call
             }
         }
     }