From 1b281e0bfe623f256a3614c5e5527e116fac147d Mon Sep 17 00:00:00 2001
From: Dan Mills <thunder@mozilla.com>
Date: Wed, 16 Apr 2008 14:46:57 -0700
Subject: [PATCH] service: remove accidental 'resetServer' call in sync (\!);
 dav: lock a file called 'lock', instead of the entire collection (workaround
 for bug 421610)

---
 services/sync/modules/dav.js     | 4 ++--
 services/sync/modules/service.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/sync/modules/dav.js b/services/sync/modules/dav.js
index 76c5ab0ad320..250e34f51bef 100644
--- a/services/sync/modules/dav.js
+++ b/services/sync/modules/dav.js
@@ -354,7 +354,7 @@ DAVCollection.prototype = {
       yield;
     }
 
-    this.LOCK("",
+    this.LOCK("lock",
               "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
               "<D:lockinfo xmlns:D=\"DAV:\">\n" +
               "  <D:locktype><D:write/></D:locktype>\n" +
@@ -398,7 +398,7 @@ DAVCollection.prototype = {
       yield;
     }
 
-    this.UNLOCK("", self.cb);
+    this.UNLOCK("lock", self.cb);
     let resp = yield;
 
     if (this._authProvider._authFailed ||
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 5db097c01fa0..8de097fa8f99 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -493,7 +493,6 @@ WeaveSvc.prototype = {
       if (engines[i].enabled) {
         this._notify(engines[i].name + "-engine:sync",
                      this._syncEngine, engines[i]).async(this, self.cb);
-        engines[i].resetServer(self.cb);
         yield;
         if (engines[i].name == "bookmarks") { // FIXME
           Engines.get("bookmarks").syncMounts(self.cb);