service: remove accidental 'resetServer' call in sync (\!); dav: lock a file called 'lock', instead of the entire collection (workaround for bug 421610)

This commit is contained in:
Dan Mills 2008-04-16 14:46:57 -07:00
parent 9a24767ab7
commit 1b281e0bfe
2 changed files with 2 additions and 3 deletions

View File

@ -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 ||

View File

@ -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);