svn commit: r935232 - /openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

[ppoddar]

Author: ppoddar
Date: Sat Apr 17 19:30:56 2010
New Revision: 935232

URL: http://svn.apache.org/viewvc?rev=935232&view=rev
Log:
OPENJPA-703: Ignore prepared query if query is locking. Merged from trunk 
revision 935231

Modified:
    
openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Modified: 
openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=935232&r1=935231&r2=935232&view=diff
==============================================================================
--- 
openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
 (original)
+++ 
openjpa/branches/2.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
 Sat Apr 17 19:30:56 2010
@@ -508,8 +508,12 @@ public class QueryImpl<X> implements Ope
             return false;
         }
         FetchConfiguration fetch = _query.getFetchConfiguration();
-        if (fetch.getReadLockLevel() != 0)
+        if (fetch.getReadLockLevel() != 0) {
+            if (cache.get(_id) != null) {
+                ignorePreparedQuery();
+            }
             return false;
+        }
         Boolean registered = cache.register(_id, _query, fetch);
         boolean alreadyCached = (registered == null);
         String lang = _query.getLanguage();