svn commit: r922123 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

[ppoddar]

Author: ppoddar
Date: Fri Mar 12 02:35:03 2010
New Revision: 922123

URL: http://svn.apache.org/viewvc?rev=922123&view=rev
Log:
OPENJPA-1561: Cache criteria query

Modified:
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=922123&r1=922122&r2=922123&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
 Fri Mar 12 02:35:03 2010
@@ -1042,8 +1042,8 @@ public class EntityManagerImpl
         return newQueryImpl(kernelQuery);
     }
 
-    protected <X> QueryImpl<X> newQueryImpl(org.apache.openjpa.kernel.Query 
kernelQuery) {
-        return new QueryImpl<X>(this, _ret, kernelQuery);
+    protected <T> QueryImpl<T> newQueryImpl(org.apache.openjpa.kernel.Query 
kernelQuery) {
+        return new QueryImpl<T>(this, _ret, kernelQuery);
     }
 
     /**
@@ -1565,7 +1565,7 @@ public class EntityManagerImpl
         
         org.apache.openjpa.kernel.Query kernelQuery 
=_broker.newQuery(CriteriaBuilderImpl.LANG_CRITERIA, criteriaQuery);
         
-        QueryImpl<T> facadeQuery = newQueryImpl(kernelQuery);
+        QueryImpl<T> facadeQuery = 
newQueryImpl(kernelQuery).setId(criteriaQuery.toString());
         Set<ParameterExpression<?>> params = criteriaQuery.getParameters();
         
         for (ParameterExpression<?> param : params) {