www

commit 0920e25393e90f07eaeffc3a5bf282803e0957ab
parent e4bc715dc1cb885f7cbcab1fc5f769876efeba0c
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 14 Apr 2017 22:49:24 -0400

Make 404 handling for uploaded objects permanent

Related to https://github.com/zotero/dataserver/commit/aafda6d835

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncEngine.js
 | 
3
---

1 file changed, 0 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -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;