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 2010/04/17 21:10:16 UTC
svn commit: r935231 -
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
Author: ppoddar
Date: Sat Apr 17 19:10:15 2010
New Revision: 935231
URL: http://svn.apache.org/viewvc?rev=935231&view=rev
Log:
OPENJPA-703: Ignore prepared query if query using locks
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=935231&r1=935230&r2=935231&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Sat Apr 17 19:10:15 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();