Improve error message when an account is already in use

[signal-cli] / src / main / java / org / asamk / signal / jsonrpc / SignalJsonRpcDispatcherHandler.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 23c89f26ef810c596a7bf8bbb595b204675b1e1f..8d13ad2875ad1b819fb23ed9b51643cf686c10ad 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

+import java.nio.channels.OverlappingFileLockException;

 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;


@@ -182,6 +183,9 @@ public class SignalJsonRpcDispatcherHandler {
                 final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
                 ((ObjectNode) params).remove("account");
                 return registrationManager;
                 final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
                 ((ObjectNode) params).remove("account");
                 return registrationManager;

+            } catch (OverlappingFileLockException e) {
+                logger.warn("Account is already in use");
+                return null;

             } catch (IOException | IllegalStateException e) {
                 logger.warn("Failed to load registration manager", e);
                 return null;
             } catch (IOException | IllegalStateException e) {
                 logger.warn("Failed to load registration manager", e);
                 return null;