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/03/29 22:30:58 UTC

svn commit: r928897 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Author: ppoddar
Date: Mon Mar 29 20:30:58 2010
New Revision: 928897

URL: http://svn.apache.org/viewvc?rev=928897&view=rev
Log:
OPENJPA-1602: Ignore prepared queries that use 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=928897&r1=928896&r2=928897&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 Mon Mar 29 20:30:58 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();



Re: svn commit: r928897 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java

Posted by Donald Woods <dw...@apache.org>.
Pinkai, does this need to be included in 2.0.0?  Does it fix a scenario
that is covered by a junit?


-Donald


On 3/29/10 4:30 PM, ppoddar@apache.org wrote:
> Author: ppoddar
> Date: Mon Mar 29 20:30:58 2010
> New Revision: 928897
> 
> URL: http://svn.apache.org/viewvc?rev=928897&view=rev
> Log:
> OPENJPA-1602: Ignore prepared queries that use 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=928897&r1=928896&r2=928897&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 Mon Mar 29 20:30:58 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();
> 
> 
>