mirror of https://github.com/apache/openjpa.git
Complete merge of revision 690355 from 0.9.7 to 1.1.x.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.1.x@713820 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d0fca66128
commit
50d80f5b6d
|
@ -24,11 +24,11 @@ import java.io.Serializable;
|
|||
import java.util.BitSet;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
import org.apache.openjpa.enhance.PersistenceCapable;
|
||||
import org.apache.openjpa.enhance.StateManager;
|
||||
import org.apache.openjpa.lib.util.Localizer;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
import org.apache.openjpa.meta.ClassMetaData;
|
||||
import org.apache.openjpa.meta.FieldMetaData;
|
||||
import org.apache.openjpa.meta.JavaTypes;
|
||||
|
@ -555,7 +555,7 @@ public class DetachedStateManager
|
|||
String next, int set) {
|
||||
accessingField(idx);
|
||||
if (cur == next || (cur != null && cur.equals(next))
|
||||
|| !_loaded.get(idx))
|
||||
|| !_loaded.get(idx))
|
||||
return;
|
||||
lock();
|
||||
try {
|
||||
|
|
Loading…
Reference in New Issue