Use getOrPut() to resolve race conditon with Links (#26)

freyacodes · web-flow · commit 133a10ce32ea · 2024-03-14T12:53:44.000Z
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
@@ -104,12 +104,9 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {
      */
     @JvmOverloads
     fun getOrCreateLink(guildId: Long, region: VoiceRegion? = null): Link {
-        if (!linkMap.containsKey(guildId)) {
-            val bestNode = loadBalancer.selectNode(region, guildId)
-            linkMap[guildId] = Link(guildId, bestNode)
+        return linkMap.getOrPut(guildId) {
+            Link(guildId, loadBalancer.selectNode(region, guildId))
         }
-
-        return linkMap[guildId]!!
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,9 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {`
`104`	`104`	`*/`
`105`	`105`	`@JvmOverloads`
`106`	`106`	`fun getOrCreateLink(guildId: Long, region: VoiceRegion? = null): Link {`
`107`		`- if (!linkMap.containsKey(guildId)) {`
`108`		`- val bestNode = loadBalancer.selectNode(region, guildId)`
`109`		`- linkMap[guildId] = Link(guildId, bestNode)`
	`107`	`+ return linkMap.getOrPut(guildId) {`
	`108`	`+ Link(guildId, loadBalancer.selectNode(region, guildId))`
`110`	`109`	`}`
`111`		`-`
`112`		`- return linkMap[guildId]!!`
`113`	`110`	`}`
`114`	`111`
`115`	`112`	`/**`