diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java index 9a8b0f45b..f5be8cac7 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SaveFieldManager.java @@ -193,9 +193,7 @@ public class SaveFieldManager public Object fetchObjectField(int field) { // return the copied field during save, or a null value during restore - Object val = _field; - _field = null; - return val; + return _field; } public void storeObjectField(int field, Object curVal) { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java index b68890f6b..a7d8e7aa7 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SavepointFieldManager.java @@ -194,10 +194,7 @@ class SavepointFieldManager } public Object fetchObjectField(int field) { - // return the copied field during save, or a null value during restore - Object val = _field; - _field = null; - return val; + return _field; } public void storeObjectField(int field, Object curVal) { diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java index 47f4c98a5..8bbaa910b 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/TransferFieldManager.java @@ -62,10 +62,7 @@ class TransferFieldManager } public Object fetchObjectField(int field) { - // don't hold onto strong ref to object - Object val = objval; - objval = null; - return val; + return objval; } public short fetchShortField(int field) {