KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

fix: improve lock handling in user session interactions #36

Merged
lq64 merged 1 commits from fix/locks into main 2025-11-05 11:19:37 +01:00
Conversation 1 Commits 1 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
knockoutwhistweb/app/logic/game/GameLobby.scala
View File

@@ -185,7 +185,7 @@ class GameLobby private(
} }
private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = { private def getPlayerInteractable(userSession: UserSession, iType: InteractionType): AbstractPlayer = {
if (!Thread.holdsLock(userSession.lock)) { if (!userSession.lock.isHeldByCurrentThread) {
throw new IllegalStateException("The user session is not locked!") throw new IllegalStateException("The user session is not locked!")
} }
if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) { if (userSession.canInteract.isEmpty || userSession.canInteract.get != iType) {

2
knockoutwhistweb/app/model/sessions/UserSession.scala
View File

@@ -9,7 +9,7 @@ import java.util.concurrent.locks.{Lock, ReentrantLock}
class UserSession(user: User, val host: Boolean) extends PlayerSession { class UserSession(user: User, val host: Boolean) extends PlayerSession {
var canInteract: Option[InteractionType] = None var canInteract: Option[InteractionType] = None
val lock: Lock = ReentrantLock() val lock: ReentrantLock = ReentrantLock()
override def updatePlayer(event: SimpleEvent): Unit = { override def updatePlayer(event: SimpleEvent): Unit = {
event match { event match {