[Pkg-mozext-commits] [adblock-plus] 03/74: Issue 2232 - Got rid of non-standard conditional catch clauses

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit d4039c675101efbf02ba8962bffa9019fcc03e1f
Author: Sebastian Noack <sebastian at adblockplus.org>
Date:   Mon Mar 30 18:56:56 2015 +0200

    Issue 2232 - Got rid of non-standard conditional catch clauses
---
 lib/contentPolicy.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/contentPolicy.js b/lib/contentPolicy.js
index 9b11b9d..e0fff60 100644
--- a/lib/contentPolicy.js
+++ b/lib/contentPolicy.js
@@ -344,12 +344,17 @@ let PolicyImplementation =
     {
       registrar.registerFactory(this.classID, this.classDescription, this.contractID, this);
     }
-    catch (e if e.result == Cr.NS_ERROR_FACTORY_EXISTS)
+    catch (e)
     {
       // See bug 924340 - it might be too early to init now, the old version
       // we are replacing didn't finish removing itself yet.
-      Utils.runAsync(this.init.bind(this));
-      return;
+      if (e.result == Cr.NS_ERROR_FACTORY_EXISTS)
+      {
+        Utils.runAsync(this.init.bind(this));
+        return;
+      }
+
+      Cu.reportError(e);
     }
 
     let catMan = Utils.categoryManager;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git