From 7d8803c352b915d7a03ada3f9e5be6d5ca829e83 Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Sun, 22 Mar 2020 20:59:54 -0400 Subject: [PATCH] DRYD-846: Error when attempting to merge an authority item into itself. --- .../services/batch/nuxeo/MergeAuthorityItemsBatchJob.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/MergeAuthorityItemsBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/MergeAuthorityItemsBatchJob.java index 9778e13b7..b0c01bbde 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/MergeAuthorityItemsBatchJob.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/MergeAuthorityItemsBatchJob.java @@ -142,6 +142,14 @@ public class MergeAuthorityItemsBatchJob extends AbstractBatchJob { ? findAuthorityItemByRefName(serviceName, target) : findAuthorityItemByCsid(serviceName, target); + String targetItemCsid = getCsid(targetItemPayload); + + for (String sourceCsid : sourceCsids) { + if (sourceCsid.equals(targetItemCsid)) { + throw new DocumentException("Can't merge a record into itself."); + } + } + List sourceItemPayloads = new ArrayList(); for (String sourceCsid : sourceCsids) { -- 2.47.3