Changeset 7742

Timestamp:

Sep 5, 2019, 8:41:10 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2191: Batch item importers fail in create+update mode if an item already exists

The "item exists" check should not fail in "update" mode.

File:

• branches/3.15-stable/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java (modified) (2 diffs)

branches/3.15-stable/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

@@ -628 +628 @@
     this.failIfNotFoundItems = !createMode && "fail".equals(getErrorOption("itemNotFoundError"));
     this.updateExistingItems = updateMode;
-    this.failIfItemExists = createMode && "fail".equals(getErrorOption("itemExistsError"));
+    this.failIfItemExists = createMode && !updateMode && "fail".equals(getErrorOption("itemExistsError"));
     this.failIfMultipleFoundItems = "fail".equals(getErrorOption("multipleItemsFoundError"));
     this.failIfNotFoundReference = "fail".equals(getErrorOption("referenceNotFoundError"));
@@ -2713 +2713 @@
       parameters.add(defaultErrorParameter);
       if (!createMode) parameters.add(itemNotFoundErrorParameter);
-      if (createMode) parameters.add(itemExistsErrorParameter);
+      if (createMode && !updateMode) parameters.add(itemExistsErrorParameter);
       parameters.add(multipleItemsFoundErrorParameter);
       if (updateMode) parameters.add(noWritePermissionToItemErrorParameter);