openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awh...@apache.org
Subject svn commit: r713820 - /openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
Date Thu, 13 Nov 2008 20:56:37 GMT
Author: awhite
Date: Thu Nov 13 12:56:37 2008
New Revision: 713820

URL: http://svn.apache.org/viewvc?rev=713820&view=rev
Log:
Complete merge of revision 690355 from 0.9.7 to 1.1.x.


Modified:
    openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java

Modified: openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java?rev=713820&r1=713819&r2=713820&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
(original)
+++ openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
Thu Nov 13 12:56:37 2008
@@ -24,11 +24,11 @@
 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 @@
         String next, int set) {
         accessingField(idx);
         if (cur == next || (cur != null && cur.equals(next))
-                || !_loaded.get(idx))
+            || !_loaded.get(idx))
             return;
         lock();
         try {



Mime
View raw message