fix(index): handle errors per callback invocation

aurelia · Nov 21, 2016 · dc7819f · dc7819f
1 parent 3fb7cc0
commit dc7819f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/index.js b/src/index.js
@@ -56,24 +56,24 @@ export class EventAggregator {
         subscribers = subscribers.slice();
         i = subscribers.length;
 
-        try {
-          while (i--) {
+        while (i--) {
+          try {
             subscribers[i](data, event);
+          } catch (e) {
+            logger.error(e);
           }
-        } catch (e) {
-          logger.error(e);
         }
       }
     } else {
       subscribers = this.messageHandlers.slice();
       i = subscribers.length;
 
-      try {
-        while (i--) {
+      while (i--) {
+        try {
           subscribers[i].handle(event);
+        } catch (e) {
+          logger.error(e);
         }
-      } catch (e) {
-        logger.error(e);
       }
     }
   }

diff --git a/test/event-aggregator.spec.js b/test/event-aggregator.spec.js
@@ -317,6 +317,7 @@ describe('event aggregator', () => {
 
         ea.subscribe('dinner', crash);
         ea.subscribe('dinner', callback);
+        ea.subscribe('dinner', crash);
 
         ea.publish('dinner', data);