mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make 404 handling for uploaded objects permanent

Browse source 
Related to https://github.com/zotero/dataserver/commit/aafda6d835
This commit is contained in:
Dan Stillman 2017-04-14 22:49:24 -04:00
parent e4bc715dc1
commit 0920e25393
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/sync/syncEngine.js
View file

@ -1155,8 +1155,6 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = Zotero.Promise.coroutine(func
// This shouldn't happen, because the upload request includes a library version and should
// prevent an outdated upload before the object version is checked. If it does, we need to
// do a full sync. This error is checked in handleUploadError().
// TEMP - Revert after 2016-08-19
//if (e.code == 412) {
if (e.code == 404 || e.code == 412) {
throw e;
}
@ -1599,7 +1597,6 @@ Zotero.Sync.Data.Engine.prototype._handleUploadError = Zotero.Promise.coroutine(
}
else if (e.name == "ZoteroObjectUploadError") {
switch (e.code) {
// TEMP - Revert after 2016-08-19
case 404:
case 412:
return this.UPLOAD_RESULT_OBJECT_CONFLICT;