Don't let locks pile up

Mindgamesnl · May 6, 2024 · 84fee7f · 84fee7f
1 parent 77a978d
commit 84fee7f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin
@@ -1 +1 @@
-BUILD_NUM="1422"
+BUILD_NUM="1425"
diff --git a/.../src/main/java/com/craftmend/openaudiomc/generic/networking/DefaultNetworkingService.java b/.../src/main/java/com/craftmend/openaudiomc/generic/networking/DefaultNetworkingService.java
@@ -32,6 +32,7 @@
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -117,7 +118,7 @@ private void init() {
     @Override
     public void connectIfDown() {
         try {
-            if (!connectLock.tryLock())
+            if (!connectLock.tryLock(30, TimeUnit.SECONDS))
                 return;
 
             if (!OpenAudioMc.getService(StateService.class).getCurrentState().canConnect()) {
@@ -128,6 +129,8 @@ public void connectIfDown() {
             // update state
             OpenAudioMc.getService(OpenaudioAccountService.class).startVoiceHandshake();
             socketConnection.setupConnection();
+        } catch (InterruptedException e) {
+            // ignore - its okay
         } finally {
             connectLock.unlock();
         }

diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin
@@ -1 +1 @@
-BUILD_NUM="1422"
+BUILD_NUM="1425"
diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties
@@ -1,3 +1,3 @@
-BUILD_VERSION="1422"
-BUILD_COMMIT="a240b0a022573dc70f34c337f24af00706700423"
+BUILD_VERSION="1425"
+BUILD_COMMIT="77a978d05757e72d10c56304722a8dbd50ea118e"
 BUILD_AUTHOR="Mats"