Bug 1223054 - Fix add-on registration r=ferjm
authorFabrice Desré <fabrice@mozilla.com>
Sat, 21 Nov 2015 16:00:37 -0800
changeset 273716 7f501ebf62efdfebc32f23ff7be90edd824bce01
parent 273715 546a50ae3ff26df970498fbfc97f4dc032bad5d2
child 273717 5763898486c46c9d301c7b254d6b1f086ab64666
push id68366
push usercbook@mozilla.com
push dateMon, 23 Nov 2015 13:31:58 +0000
treeherdermozilla-inbound@eff4131a3e4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersferjm
bugs1223054
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1223054 - Fix add-on registration r=ferjm
dom/apps/UserCustomizations.jsm
--- a/dom/apps/UserCustomizations.jsm
+++ b/dom/apps/UserCustomizations.jsm
@@ -48,20 +48,26 @@ this.UserCustomizations = {
     debug("Starting customization registration for " + aApp.manifestURL + "\n");
 
     let extension = new Extension({
       id: AppsUtils.computeHash(aApp.manifestURL),
       resourceURI: Services.io.newURI(aApp.origin + "/", null, null)
     });
 
     this.extensions.set(aApp.manifestURL, extension);
-    extension.startup().then(() => {
-      let uri = Services.io.newURI(aApp.origin, null, null);
-      this.appId.add(uri.host);
-    });
+    let uri = Services.io.newURI(aApp.origin, null, null);
+    debug(`Adding ${uri.host} to appId set`);
+    this.appId.add(uri.host);
+
+    extension.startup()
+      .then(() => { })
+      .catch((err) => {
+        debug(`extension.startup failed: ${err}`);
+        this.appId.delete(uri.host);
+      });
   },
 
   unregister: function(aApp) {
     if (!this._enabled) {
       return;
     }
 
     debug("Starting customization unregistration for " + aApp.manifestURL);