Merge pull request #20122 from stuartwdouglas/fix-deadlock

Fix deadlock on write
quarkusio · Sep 15, 2021 · 0d08085 · 0d08085
2 parents d35d508 + af17444
commit 0d08085
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java
@@ -320,10 +320,10 @@ public void write(boolean errorStream, String s) {
         }
 
         StringBuilder buffer = new StringBuilder();
+        if (!shouldWrite(errorStream, s)) {
+            return;
+        }
         synchronized (this) {
-            if (!shouldWrite(errorStream, s)) {
-                return;
-            }
             if (totalStatusLines == 0) {
                 bottomBlankSpace = 0; //just to be safe, will only happen if status is added then removed, which is not really likely
                 writeQueue.add(s);