Merge pull request #78 from modelix/issues/MODELIX-421

mhuster23 · web-flow · commit c9e73592fc36 · 2023-04-14T09:06:14.000+02:00
MODELIX-421: Memory leak in light-model-server when clients disconnect and reconnect
diff --git a/model-server-lib/src/main/kotlin/org/modelix/model/server/light/LightModelServer.kt b/model-server-lib/src/main/kotlin/org/modelix/model/server/light/LightModelServer.kt
@@ -116,12 +116,15 @@ class LightModelServer(val port: Int, val rootNode: INode, val ignoredRoles: Set
         }
         routing {
             webSocket("/ws") {
+                var session: SessionData? = null
                 try {
-                    val session = SessionData(this)
+                    session = SessionData(this)
                     sessions.add(session)
                     handleWebsocket(session)
                 } catch (ex: Exception) {
                     LOG.error(ex) { "Error in websocket handler" }
+                } finally {
+                    sessions.remove(session)
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,15 @@ class LightModelServer(val port: Int, val rootNode: INode, val ignoredRoles: Set`
`116`	`116`	`}`
`117`	`117`	`routing {`
`118`	`118`	`webSocket("/ws") {`
	`119`	`+ var session: SessionData? = null`
`119`	`120`	`try {`
`120`		`- val session = SessionData(this)`
	`121`	`+ session = SessionData(this)`
`121`	`122`	`sessions.add(session)`
`122`	`123`	`handleWebsocket(session)`
`123`	`124`	`} catch (ex: Exception) {`
`124`	`125`	`LOG.error(ex) { "Error in websocket handler" }`
	`126`	`+ } finally {`
	`127`	`+ sessions.remove(session)`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`	`}`