Gemini feedback 2

Author: kabir

server-common/src/main/java/io/a2a/server/events/EventQueue.java

@@ -306,21 +306,19 @@ void childClosing(ChildQueue child, boolean immediate) {
          * Called by MainEventBusProcessor after TaskStore persistence.
          */
         void distributeToChildren(EventQueueItem item) {
-            synchronized (children) {
-                int childCount = children.size();
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("MainQueue[{}]: Distributing event {} to {} children",
-                                taskId, item.getEvent().getClass().getSimpleName(), childCount);
-                }
-                children.forEach(child -> {
-                    LOGGER.debug("MainQueue[{}]: Enqueueing event {} to child queue",
-                                taskId, item.getEvent().getClass().getSimpleName());
-                    child.internalEnqueueItem(item);
-                });
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("MainQueue[{}]: Completed distribution of {} to {} children",
-                                taskId, item.getEvent().getClass().getSimpleName(), childCount);
-                }
+            int childCount = children.size();
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("MainQueue[{}]: Distributing event {} to {} children",
+                            taskId, item.getEvent().getClass().getSimpleName(), childCount);
+            }
+            children.forEach(child -> {
+                LOGGER.debug("MainQueue[{}]: Enqueueing event {} to child queue",
+                            taskId, item.getEvent().getClass().getSimpleName());
+                child.internalEnqueueItem(item);
+            });
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("MainQueue[{}]: Completed distribution of {} to {} children",
+                            taskId, item.getEvent().getClass().getSimpleName(), childCount);
             }
         }
 

server-common/src/main/java/io/a2a/server/events/MainEventBusProcessor.java

@@ -78,7 +78,7 @@ public void setCallback(MainEventBusProcessorCallback callback) {
     @PostConstruct
     void start() {
         processorThread = new Thread(this, "MainEventBusProcessor");
-        processorThread.setDaemon(false); // Keep JVM alive
+        processorThread.setDaemon(true); // Allow JVM to exit even if this thread is running
         processorThread.start();
         LOGGER.info("MainEventBusProcessor started");
     }
@@ -98,9 +98,13 @@ void stop() {
         if (processorThread != null) {
             processorThread.interrupt();
             try {
+                long start = System.currentTimeMillis();
                 processorThread.join(5000); // Wait up to 5 seconds
+                long elapsed = System.currentTimeMillis() - start;
+                LOGGER.info("MainEventBusProcessor thread stopped in {}ms", elapsed);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
+                LOGGER.warn("Interrupted while waiting for MainEventBusProcessor thread to stop");
             }
         }
         LOGGER.info("MainEventBusProcessor stopped");