Notify the batch delivery listener in any case.

SpineEventEngine · Aug 31, 2019 · 0ab5620 · 0ab5620
1 parent feb7f61
commit 0ab5620
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/server/src/main/java/io/spine/server/delivery/TargetDelivery.java b/server/src/main/java/io/spine/server/delivery/TargetDelivery.java
@@ -160,10 +160,13 @@ private void deliverVia(BatchDeliveryListener<I> dispatcher,
                 @SuppressWarnings("unchecked")      // Only IDs of type `I` are stored.
                         I id = (I) Identifier.unpack(packedId);
                 dispatcher.onStart(id);
-                for (InboxMessage message : messages) {
-                    doDeliver(cmdDispatcher, eventDispatcher, message);
+                try {
+                    for (InboxMessage message : messages) {
+                        doDeliver(cmdDispatcher, eventDispatcher, message);
+                    }
+                } finally {
+                    dispatcher.onEnd(id);
                 }
-                dispatcher.onEnd(id);
             } else {
                 doDeliver(cmdDispatcher, eventDispatcher, messages.get(0));
             }