From 8cbd7a12c9eba8677c7f1160913c30f8901ab29a Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Fri, 14 Jul 2017 10:50:54 -0700 Subject: [PATCH] Bug 1381023: Follow-up: Fix xpcshell failure. MozReview-Commit-ID: BB8ItETtRMb --HG-- extra : rebase_source : 81885a8417d83dcae6b0a3896483f0a60e56cb8b --- toolkit/components/extensions/ExtensionParent.jsm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/toolkit/components/extensions/ExtensionParent.jsm b/toolkit/components/extensions/ExtensionParent.jsm index 3f3e89c96939..a4f1db1c5395 100644 --- a/toolkit/components/extensions/ExtensionParent.jsm +++ b/toolkit/components/extensions/ExtensionParent.jsm @@ -245,11 +245,13 @@ ProxyMessenger = { result = res; } } catch (e) { - if (e.result !== MessageChannel.RESULT_NO_HANDLER && - e.result !== MessageChannel.RESULT_NO_RESPONSE) { + if (e.result === MessageChannel.RESULT_NO_RESPONSE) { + // Ignore. + } else if (e.result === MessageChannel.RESULT_NO_HANDLER) { + failures++; + } else { throw e; } - failures++; } };