From 856d753c7f335dacd9cc4daf666a152378886200 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Tue, 16 Apr 2019 18:07:11 +0200
Subject: Upgrade Kotlin to 1.3.30 Upgrade coroutines to 1.2.0 Upgrade
 serialization to 0.11.0 Upgrade Ktor to 1.1.4 Upgrade Spring Boot to 2.1.4

---
 .../pl/treksoft/kvision/remote/KVServiceManager.kt  | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'kvision-modules/kvision-server-jooby')

diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index ca08b080..c3c179fc 100644
--- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -30,8 +30,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.channels.SendChannel
-import kotlinx.coroutines.channels.filterNotNull
-import kotlinx.coroutines.channels.map
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import org.jooby.Kooby
@@ -344,16 +342,19 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                             ws.close()
                         }
                         launch {
-                            val requestChannel = incoming.map {
-                                val jsonRpcRequest = getParameter<JsonRpcRequest>(it)
-                                if (jsonRpcRequest.params.size == 1) {
-                                    getParameter<PAR1>(jsonRpcRequest.params[0])
-                                } else {
-                                    null
-                                }
-                            }.filterNotNull()
+                            val requestChannel = Channel<PAR1>()
                             val responseChannel = Channel<PAR2>()
                             coroutineScope {
+                                launch {
+                                    for (p in incoming) {
+                                        val jsonRpcRequest = getParameter<JsonRpcRequest>(p)
+                                        if (jsonRpcRequest.params.size == 1) {
+                                            val par = getParameter<PAR1>(jsonRpcRequest.params[0])
+                                            requestChannel.send(par)
+                                        }
+                                    }
+                                    requestChannel.close()
+                                }
                                 launch(Dispatchers.IO) {
                                     for (p in responseChannel) {
                                         val text = mapper.writeValueAsString(
-- 
cgit