fix chery-pick conflict

This commit is contained in:
KevinVdV
2016-03-31 09:35:12 +02:00
committed by dylan
parent 0e70aec96c
commit b09594ed04
7 changed files with 62 additions and 39 deletions

View File

@@ -396,12 +396,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
*/
protected void deleteMetadata(Context context, T dso) throws SQLException {
Iterator<MetadataValue> metadataValueIterator = dso.getMetadata().iterator();
while (metadataValueIterator.hasNext()) {
MetadataValue metadataValue = metadataValueIterator.next();
metadataValueIterator.remove();
metadataValueService.delete(context, metadataValue);
}
metadataValueService.delete(context, dso);
}
/**