www

commit 52c12495231435e6a477d82cfe0c1f8aa2e79433
parent c5cd38b4a573dc7c343f246b6869d6b851cac999
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 29 Mar 2018 08:27:18 -0400

Fix weird test failure after c5cd38b4a5

The change in c5cd38b4a5 seems like it shouldn't have had any effect,
but creating an empty Set before yielding somehow avoided a race
condition with the subsequent updateSession call.

Diffstat:
M
chrome/content/zotero/xpcom/server_connector.js
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
@@ -164,17 +164,17 @@ Zotero.Server.Connector.SaveSession.prototype.update = async function (libraryID
 };
 
 Zotero.Server.Connector.SaveSession.prototype._addObjects = async function (objectType, objects) {
-	// Update the objects with the current target data, in case it changed since the save began
-	await this._updateObjects({
-		[objectType]: objects
-	});
-	
 	if (!this._objects[objectType]) {
 		this._objects[objectType] = new Set();
 	}
 	for (let object of objects) {
 		this._objects[objectType].add(object);
 	}
+	
+	// Update the objects with the current target data, in case it changed since the save began
+	await this._updateObjects({
+		[objectType]: objects
+	});
 };
 
 /**