Bug 941752: Fix misspelled attribute name and undefined property warning; r=Mossop a=lsblakk
authorIrving Reid <irving@mozilla.com>
Wed, 18 Dec 2013 12:25:26 -0800
changeset 167775 53889e96edd9298a89eb2ad767c32663c1db2861
parent 167774 069d7c01db7d65c55b6d63594afff1277a1683a3
child 167778 abcbe0e114e3e6f2956169f39e8fe19e1d0d99a9
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop, lsblakk
bugs941752
milestone27.0
Bug 941752: Fix misspelled attribute name and undefined property warning; r=Mossop a=lsblakk
toolkit/mozapps/extensions/XPIProvider.jsm
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -3260,17 +3260,17 @@ var XPIProvider = {
       // All the remaining add-ons in this install location must be new.
 
       // Get the migration data for this install location.
       let locMigrateData = {};
       if (XPIDatabase.migrateData && installLocation.name in XPIDatabase.migrateData)
         locMigrateData = XPIDatabase.migrateData[installLocation.name];
       for (let id in addonStates) {
         changed = addMetadata(installLocation, id, addonStates[id],
-                              locMigrateData[id]) || changed;
+                              locMigrateData[id] || null) || changed;
       }
     }, this);
 
     // The remaining locations that had add-ons installed in them no longer
     // have any add-ons installed in them, or the locations no longer exist.
     // The metadata for the add-ons that were in them must be removed from the
     // database.
     for (let location of knownLocations) {
@@ -6855,17 +6855,17 @@ DirectoryInstallLocation.prototype = {
     let dir = this.getStagingDir();
 
     for (let name of aLeafNames) {
       let file = dir.clone();
       file.append(name);
       recursiveRemove(file);
     }
 
-    if (this.stagingDirLock > 0)
+    if (this._stagingDirLock > 0)
       return;
 
     let dirEntries = dir.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
     try {
       if (dirEntries.nextFile)
         return;
     }
     finally {