From a98fee0b5eaf1a80cecf99f4b12a53a9b6f3c511 Mon Sep 17 00:00:00 2001
From: Tom Desair <tom.desair@atmire.com>
Date: Tue, 19 Apr 2016 15:07:35 +0200
Subject: [PATCH] DS-3086: Fixed bug that made the integration tests fail

---
 .../src/main/java/org/dspace/content/DSpaceObject.java    | 2 +-
 dspace-api/src/main/java/org/dspace/core/Context.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java b/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
index 29495199c3..280e10e274 100644
--- a/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
+++ b/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
@@ -39,7 +39,7 @@ public abstract class DSpaceObject implements Serializable, ReloadableEntity<jav
     @Transient
     private StringBuffer eventDetails = null;
     
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "dSpaceObject", cascade = CascadeType.ALL)
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "dSpaceObject", cascade = CascadeType.ALL, orphanRemoval = true)
     @OrderBy("metadataField, place")
     private List<MetadataValue> metadata = new ArrayList<>();
 
diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index 670f3b820e..56512ce986 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -371,8 +371,8 @@ public class Context
      * The database connection is not closed and can be reused afterwards.
      *
      * <b>WARNING: After calling this method all previously fetched entities are "detached" (pending
-     * changes are not tracked anymore). You have to reload all entities you still want to work manually
-     * after this method call (see {@link Context#reloadEntity(ReloadableEntity)}).</b>
+     * changes are not tracked anymore). You have to reload all entities you still want to work with
+     * manually after this method call (see {@link Context#reloadEntity(ReloadableEntity)}).</b>
      *
      * @throws SQLException When committing the transaction in the database fails.
      */
@@ -635,8 +635,8 @@ public class Context
      * (heap space) memory. You should use this method when processing a large number of records.
      *
      * <b>WARNING: After calling this method all previously fetched entities are "detached" (pending
-     * changes are not tracked anymore). You have to reload all entities you still want to work manually
-     * after this method call (see {@link Context#reloadEntity(ReloadableEntity)}).</b>
+     * changes are not tracked anymore). You have to reload all entities you still want to work with
+     * manually after this method call (see {@link Context#reloadEntity(ReloadableEntity)}).</b>
      *
      * This method will take care of reloading the current user.
      *