#329 relax bulk avu delete when no avus to delete

DICE-UNC · Mar 27, 2019 · 6a8d848 · 6a8d848
1 parent 8ee3539
commit 6a8d848
Show file tree

Hide file tree

Showing 2 changed files with 170 additions and 170 deletions.
diff --git a/jargon-core/src/main/java/org/irods/jargon/core/pub/CollectionAOImpl.java b/jargon-core/src/main/java/org/irods/jargon/core/pub/CollectionAOImpl.java
@@ -78,12 +78,9 @@ public final class CollectionAOImpl extends FileCatalogObjectAOImpl implements C
 	/**
 	 * Default constructor
 	 *
-	 * @param irodsSession
-	 *            {@link IRODSSession}
-	 * @param irodsAccount
-	 *            {@link IRODSAccount}
-	 * @throws JargonException
-	 *             for iRODS error
+	 * @param irodsSession {@link IRODSSession}
+	 * @param irodsAccount {@link IRODSAccount}
+	 * @throws JargonException for iRODS error
 	 */
 	protected CollectionAOImpl(final IRODSSession irodsSession, final IRODSAccount irodsAccount)
 			throws JargonException {
@@ -600,8 +597,12 @@ public void deleteAllAVUMetadata(final String absolutePath) throws FileNotFoundE
 					.add(AvuData.instance(metadata.getAvuAttribute(), metadata.getAvuValue(), metadata.getAvuUnit()));
 		}
 
-		deleteBulkAVUMetadataFromCollection(objStat.getAbsolutePath(), avusToDelete);
-		log.debug("metadata removed");
+		if (avusToDelete.isEmpty()) {
+			log.debug("no metadata to delete");
+		} else {
+			deleteBulkAVUMetadataFromCollection(objStat.getAbsolutePath(), avusToDelete);
+			log.debug("metadata removed");
+		}
 	}
 
 	/*
@@ -1641,8 +1642,8 @@ public FilePermissionEnum getPermissionForCollection(final String irodsAbsoluteP
 	 * @param absolutePath
 	 * @param recursive
 	 * @return
-	 * @throws FileNotFoundException
-	 *             if the underlying file is not found by the absolute path
+	 * @throws FileNotFoundException if the underlying file is not found by the
+	 *                               absolute path
 	 * @throws JargonException
 	 */
 	private boolean adjustRecursiveOption(final String absolutePath, final boolean recursive)