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

[dwoods]

Author: dwoods
Date: Wed Mar 31 01:41:08 2010
New Revision: 929358

URL: http://svn.apache.org/viewvc?rev=929358&view=rev
Log:
OPENJPA-1602 Ignore prepared queries that use locks.  Merged in from trunk 
r928897.  Original patch by Pinaki.

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=929358&r1=929357&r2=929358&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
 Wed Mar 31 01:41:08 2010
@@ -508,6 +508,8 @@ public class QueryImpl<X> implements Ope
             return false;
         }
         FetchConfiguration fetch = _query.getFetchConfiguration();
+        if (fetch.getReadLockLevel() != 0)
+            return false;
         Boolean registered = cache.register(_id, _query, fetch);
         boolean alreadyCached = (registered == null);
         String lang = _query.getLanguage();