fix getting coroutine context

rsocket · Nov 12, 2020 · b53b1a9 · b53b1a9
1 parent 79135dd
commit b53b1a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/RSocketRequesterImpl.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/RSocketRequesterImpl.kt
@@ -56,7 +56,7 @@ internal class RSocketRequesterImpl(
     override fun requestStream(payload: suspend () -> Payload): Flow<Payload> = flow {
         val p = payload()
         p.closeOnError {
-            val strategy = coroutineContext.requestStrategy()
+            val strategy = currentCoroutineContext().requestStrategy()
             val initialRequest = strategy.firstRequest()
             val streamId = createStream()
 
@@ -70,7 +70,7 @@ internal class RSocketRequesterImpl(
 
     @OptIn(ExperimentalStreamsApi::class)
     override fun requestChannel(payloads: Flow<Payload>): Flow<Payload> = flow {
-        val strategy = coroutineContext.requestStrategy()
+        val strategy = currentCoroutineContext().requestStrategy()
         val initialRequest = strategy.firstRequest()
         val streamId = createStream()
         val receiverDeferred = CompletableDeferred<ReceiveChannel<RequestFrame>?>()

diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/RSocketResponderImpl.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/RSocketResponderImpl.kt
@@ -81,7 +81,7 @@ internal class RSocketResponderImpl(
 
         //TODO single collect
         val request = flow {
-            val strategy = coroutineContext.requestStrategy()
+            val strategy = currentCoroutineContext().requestStrategy()
             val initialRequest = strategy.firstRequest()
             send(RequestNFrame(streamId, initialRequest))
             collectStream(streamId, receiver, strategy, this)