Release the read lock in a finally block (#703)

apache · Oct 16, 2022 · e1e5c08 · e1e5c08
1 parent b408dea
commit e1e5c08
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
@@ -469,14 +469,17 @@ void readInputLoop() {
         try {
             while (!closing) {
                 if (readInput.readLock().tryLock(10, TimeUnit.MILLISECONDS)) {
-                    int c = terminal.reader().read(10);
-                    if (c == -1) {
-                        break;
-                    }
-                    if (c == KEY_PLUS || c == KEY_MINUS || c == KEY_CTRL_L || c == KEY_CTRL_M || c == KEY_CTRL_B) {
-                        daemonReceive.accept(Message.keyboardInput((char) c));
+                    try {
+                        int c = terminal.reader().read(10);
+                        if (c == -1) {
+                            break;
+                        }
+                        if (c == KEY_PLUS || c == KEY_MINUS || c == KEY_CTRL_L || c == KEY_CTRL_M || c == KEY_CTRL_B) {
+                            daemonReceive.accept(Message.keyboardInput((char) c));
+                        }
+                    } finally {
+                        readInput.readLock().unlock();
                     }
-                    readInput.readLock().unlock();
                 }
             }
         } catch (InterruptedException e) {