Bug 1060691 - Clean up settings api debug messages; r=gwagner a=2.1
authorKyle Machulis <kyle@nonpolynomial.com>
Fri, 29 Aug 2014 16:36:02 -0700
changeset 202669 492bf5f4325dd124c21c951d4d4350bd0e3bbc94
parent 202668 3ab215c508444aafb73bc19a2db015e4ac58b585
child 202670 9510f68f91988403144ccdbb4afdde5182955b02
push id27405
push userryanvm@gmail.com
push dateSun, 31 Aug 2014 02:52:08 +0000
treeherdermozilla-central@1db35d2c9a2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgwagner, 2.1
bugs1060691
milestone34.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 1060691 - Clean up settings api debug messages; r=gwagner a=2.1
dom/settings/SettingsRequestManager.jsm
--- a/dom/settings/SettingsRequestManager.jsm
+++ b/dom/settings/SettingsRequestManager.jsm
@@ -443,21 +443,21 @@ let SettingsRequestManager = {
       Services.tm.currentThread.dispatch(SettingsRequestManager.consumeTasks.bind(this), Ci.nsIThread.DISPATCH_NORMAL);
     }
   },
 
   finalizeSets: function(aTask) {
     let data = aTask.data;
     if (DEBUG) debug("Finalizing tasks for lock " + data.lockID);
     let lock = this.lockInfo[data.lockID];
-    lock.finalizing = true;
 
     if (!lock) {
       return Promise.reject({task: aTask, error: "Lock died, can't finalize"});
     }
+    lock.finalizing = true;
     if (lock._failed) {
       this.removeLock(data.lockID);
       return Promise.reject({task: aTask, error: "Lock failed a permissions check, all requests now failing."});
     }
     // If we have cleared, there is no reason to continue finalizing
     // this lock. Just resolve promise with task and move on.
     if (lock.hasCleared) {
       if (DEBUG) debug("Clear was called on lock, skipping finalize");
@@ -810,17 +810,16 @@ let SettingsRequestManager = {
       case "Settings:Run":
       case "Settings:Finalize":
         let kill_process = false;
         if (!msg.lockID) {
           Cu.reportError("Process sending request for lock that does not exist. Killing.");
           kill_process = true;
         }
         else if (!this.lockInfo[msg.lockID]) {
-          Cu.reportError("Process trying to access unknown settings lock.");
           if (DEBUG) debug("Cannot find lock ID " + msg.lockID);
           // This doesn't kill, because we can have things that file
           // finalize, then die, and we may get the observer
           // notification before we get the IPC messages.
           return;
         }
         else if (mm != this.lockInfo[msg.lockID]._mm) {
           Cu.reportError("Process trying to access settings lock from another process. Killing.");