You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/12/11 21:27:06 UTC

svn commit: r889798 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java

Author: ppoddar
Date: Fri Dec 11 20:27:05 2009
New Revision: 889798

URL: http://svn.apache.org/viewvc?rev=889798&view=rev
Log:
OPENJPA-1424: Fix. Do not lookup extraFieldData with another mapping's field

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java?rev=889798&r1=889797&r2=889798&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java Fri Dec 11 20:27:05 2009
@@ -704,7 +704,8 @@
 
         boolean isLocked = res.isLocking();
         try {
-            res.setLocking(store.getLockManager().skipRelationFieldLock());
+            if (store.getLockManager() != null)
+                res.setLocking(store.getLockManager().skipRelationFieldLock());
             sm.storeObject(field.getIndex(), res.load(cls, store, fetch,
                     eagerJoin(res.newJoins(), cls, false)));
         } finally {