Fix display showing more projects than the ones actually active

apache · Feb 23, 2021 · 0581b21 · 0581b21
1 parent 89a636f
commit 0581b21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 45 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
@@ -355,8 +355,10 @@ private boolean doAccept(Message entry) {
         }
         case Message.PROJECT_LOG_MESSAGE: {
             final ProjectEvent bm = (ProjectEvent) entry;
-            final Project prj = projects.computeIfAbsent(bm.getProjectId(), Project::new);
-            if (noBuffering || dumb) {
+            final Project prj = projects.get(bm.getProjectId());
+            if (prj == null) {
+                log.accept(bm.getMessage());
+            } else if (noBuffering || dumb) {
                 String msg;
                 if (maxThreads > 1) {
                     msg = String.format("[%s] %s", bm.getProjectId(), bm.getMessage());

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -430,7 +430,7 @@ private void cancelNow() {
     private void handle(DaemonConnection connection, BuildRequest buildRequest) {
         updateState(Busy);
         final BlockingQueue<Message> sendQueue = new PriorityBlockingQueue<>(64,
-                Comparator.comparingInt(this::getClassOrder).thenComparingLong(Message::timestamp));
+                Comparator.comparingLong(Message::timestamp));
         final BlockingQueue<Message> recvQueue = new LinkedBlockingDeque<>();
         final BuildEventListener buildEventListener = new ClientDispatcher(sendQueue);
         try (ProjectBuildLogAppender logAppender = new ProjectBuildLogAppender(buildEventListener)) {
@@ -558,48 +558,6 @@ public <T extends Message> T request(Message request, Class<T> responseType, Pre
         }
     }
 
-    int getClassOrder(Message m) {
-        switch (m.getType()) {
-        case Message.BUILD_REQUEST:
-            return 0;
-        case Message.BUILD_STARTED:
-            return 1;
-        case Message.PROMPT:
-        case Message.PROMPT_RESPONSE:
-        case Message.DISPLAY:
-            return 2;
-        case Message.PROJECT_STARTED:
-            return 3;
-        case Message.MOJO_STARTED:
-            return 4;
-        case Message.TRANSFER_INITIATED:
-        case Message.TRANSFER_STARTED:
-            return 40;
-        case Message.TRANSFER_PROGRESSED:
-            return 41;
-        case Message.TRANSFER_CORRUPTED:
-        case Message.TRANSFER_SUCCEEDED:
-        case Message.TRANSFER_FAILED:
-            return 42;
-        case Message.PROJECT_LOG_MESSAGE:
-            return 50;
-        case Message.BUILD_LOG_MESSAGE:
-            return 51;
-        case Message.PROJECT_STOPPED:
-            return 95;
-        case Message.BUILD_FINISHED:
-            return 96;
-        case Message.BUILD_EXCEPTION:
-            return 97;
-        case Message.STOP:
-            return 99;
-        case Message.KEEP_ALIVE:
-            return 100;
-        default:
-            throw new IllegalStateException("Unexpected message type " + m.getType() + ": " + m);
-        }
-    }
-
     private void updateState(DaemonState state) {
         if (getState() != state) {
             LOGGER.info("Updating state to: " + state);