Fix: Expire RelayedEndpoint when removing it. (#1909)

JonathanLennox · web-flow · commit eec0775ad6d7 · 2022-06-07T12:24:23.000-04:00
Fixes memory leak in JVB.
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt
@@ -619,9 +619,7 @@ class Relay @JvmOverloads constructor(
                 endpointsBySsrc.keys.removeAll(ep.ssrcs)
             }
         }
-        if (ep != null) {
-            conference.endpointExpired(ep)
-        }
+        ep?.expire()
     }
 
     private fun getOrCreateRelaySender(endpointId: String): RelayEndpointSender {
@@ -861,7 +859,7 @@ class Relay @JvmOverloads constructor(
         expired = true
         logger.info("Expiring.")
         synchronized(endpointsLock) {
-            relayedEndpoints.values.forEach { conference.endpointExpired(it) }
+            relayedEndpoints.values.forEach { it.expire() }
         }
         senders.values.forEach { it.expire() }
         conference.relayExpired(this)

Original file line number	Diff line number	Diff line change
`@@ -619,9 +619,7 @@ class Relay @JvmOverloads constructor(`
`619`	`619`	`endpointsBySsrc.keys.removeAll(ep.ssrcs)`
`620`	`620`	`}`
`621`	`621`	`}`
`622`		`- if (ep != null) {`
`623`		`- conference.endpointExpired(ep)`
`624`		`- }`
	`622`	`+ ep?.expire()`
`625`	`623`	`}`
`626`	`624`
`627`	`625`	`private fun getOrCreateRelaySender(endpointId: String): RelayEndpointSender {`
`@@ -861,7 +859,7 @@ class Relay @JvmOverloads constructor(`
`861`	`859`	`expired = true`
`862`	`860`	`logger.info("Expiring.")`
`863`	`861`	`synchronized(endpointsLock) {`
`864`		`- relayedEndpoints.values.forEach { conference.endpointExpired(it) }`
	`862`	`+ relayedEndpoints.values.forEach { it.expire() }`
`865`	`863`	`}`
`866`	`864`	`senders.values.forEach { it.expire() }`
`867`	`865`	`conference.relayExpired(this)`