From cc2534ddd3f3a045d9df4f6bd5cbea7c42a5cb93 Mon Sep 17 00:00:00 2001
From: Ben Bosman <ben@atmire.com>
Date: Tue, 18 Feb 2020 14:41:48 +0100
Subject: [PATCH] When moving metadata, make sure virtual metadata is handled
 correctly

---
 .../factory/impl/MetadataValueRemovePatchOperation.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MetadataValueRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MetadataValueRemovePatchOperation.java
index 4f2d092eb3..1660a5455a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MetadataValueRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MetadataValueRemovePatchOperation.java
@@ -41,7 +41,11 @@ public abstract class MetadataValueRemovePatchOperation<DSO extends DSpaceObject
         String[] metadata = Utils.tokenize(target);
         List<MetadataValue> mm = getDSpaceObjectService().getMetadata(source, metadata[0], metadata[1], metadata[2],
                                                                       Item.ANY);
-        getDSpaceObjectService().removeMetadataValues(context, source, Arrays.asList(mm.get(index)));
+        if (index != -1) {
+            getDSpaceObjectService().removeMetadataValues(context, source, Arrays.asList(mm.get(index)));
+        } else {
+            getDSpaceObjectService().clearMetadata(context, source, metadata[0], metadata[1], metadata[2], Item.ANY);
+        }
     }
 
     protected abstract DSpaceObjectService<DSO> getDSpaceObjectService();