Separate closing the connection from shutting down the application

Author: purejava

src/main/java/org/keepassxc/Connection.java

@@ -92,6 +92,11 @@ public void run() {
                     if (errorCount > MAX_ERROR_COUNT) {
                         log.info("Too much errors - stopping MessagePublisher");
                         doStop();
+                        try {
+                            terminateConnection();
+                        } catch (IOException e) {
+                            log.error(e.toString(), e.getCause());
+                        }
                         reconnect();
                     }
                 }
@@ -715,6 +720,8 @@ public void setCredentials(Optional<Credentials> credentials) {
 
     protected abstract boolean isConnected();
 
+    public abstract void terminateConnection() throws IOException;
+
     @Override
     public abstract void close() throws Exception;
 }

src/main/java/org/keepassxc/LinuxMacConnection.java

@@ -123,6 +123,11 @@ protected boolean isConnected() {
         return null != socket && socket.isOpen();
     }
 
+    @Override
+    public void terminateConnection() throws IOException {
+        if (isConnected()) socket.close();
+    }
+
     @Override
     public void close() throws Exception {
         if (null != messagePublisher) messagePublisher.doStop();

src/main/java/org/keepassxc/WindowsConnection.java

@@ -90,6 +90,11 @@ protected boolean isConnected() {
         return null != pipe && pipe.isOpen();
     }
 
+    @Override
+    public void terminateConnection() throws IOException {
+        if (isConnected()) pipe.close();
+    }
+
     @Override
     public void close() throws Exception {
         if (null != messagePublisher) messagePublisher.doStop();

src/main/java/org/purejava/KeepassProxyAccess.java

@@ -59,7 +59,7 @@ public KeepassProxyAccess() {
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
                 connection.removePropertyChangeListener(this);
             try {
-                closeConnection();
+                shutdown();
             } catch (Exception e) {
                 log.error(e.toString(), e.getCause());
             }
@@ -495,16 +495,32 @@ public String getAssociateId() {
         return connection.getAssociateId();
     }
 
+    /**
+     * Shut down the application and close the connection to the socket (for Linux and Mac)
+     * or the named pipe (for Windows) respectively.
+     *
+     * @return True, in case the connection was shut down without an error, false otherwise.
+     */
+    public boolean shutdown() {
+        try {
+            connection.close();
+            return true;
+        } catch (Exception e) {
+            log.error(e.toString(), e.getCause());
+            return false;
+        }
+    }
+
     /**
      * Close the connection to the socket (for Linux and Mac) or the named pipe (for Windows) respectively.
      *
      * @return True, in case the connection was closed without an error, false otherwise.
      */
     public boolean closeConnection() {
         try {
-            connection.close();
+            connection.terminateConnection();
             return true;
-        } catch (Exception e) {
+        } catch (IOException e) {
             log.error(e.toString(), e.getCause());
             return false;
         }

src/test/java/org/purejava/KeepassProxyAccessTest.java

@@ -18,6 +18,6 @@ public class KeepassProxyAccessTest {
     @DisplayName("Testing availability of a socket to KeePassXC")
     public void shouldHaveNoErrors() {
         assertFalse(kpa.connect());
-        assertTrue(kpa.closeConnection());
+        assertTrue(kpa.shutdown());
     }
 }

src/test/java/org/purejava/LockedDatabaseTest.java

@@ -18,6 +18,6 @@ public class LockedDatabaseTest {
     public void shouldHaveNoErrors() {
         assertTrue(kpa.connect());
         assertTrue(kpa.getDatabasehash().isEmpty());
-        assertTrue(kpa.closeConnection());
+        assertTrue(kpa.shutdown());
     }
 }

src/test/java/org/purejava/UnlockedDatabaseTest.java

@@ -52,6 +52,6 @@ public void shouldHaveNoErrors() throws InterruptedException {
         assertTrue(kpa.deleteEntry("2aafee1a89fd435c8bad7df12bbaaa3e"));
         log.info("Please deny to save changes");
         assertTrue(kpa.lockDatabase());
-        assertTrue(kpa.closeConnection());
+        assertTrue(kpa.shutdown());
     }
 }