fix(mc): Ignore send failures to non-existent or unloading target pag…

…es (#2746)
mozilla · Jun 21, 2017 · 8e48395 · 8e48395
1 parent 5e8e570
commit 8e48395
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/system-addon/lib/ActivityStreamMessageChannel.jsm b/system-addon/lib/ActivityStreamMessageChannel.jsm
@@ -108,11 +108,11 @@ this.ActivityStreamMessageChannel = class ActivityStreamMessageChannel {
   send(action) {
     const targetId = action.meta && action.meta.toTarget;
     const target = this.getTargetById(targetId);
-    if (!target) {
-      // The target is no longer around - maybe the user closed the page
-      return;
+    try {
+      target.sendAsyncMessage(this.outgoingMessageName, action);
+    } catch (e) {
+      // The target page is closed/closing by the user or test, so just ignore.
     }
-    target.sendAsyncMessage(this.outgoingMessageName, action);
   }
 
   /**