svn commit: r1597006 - /openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java

[hthomann]

Author: hthomann
Date: Fri May 23 04:04:17 2014
New Revision: 1597006

URL: http://svn.apache.org/r1597006
Log:
OPENJPA-2502: NPE in QueryKey.createKey using criteria with QueryCache enabled 
- committed Albert Lee's patch.

Modified:
    
openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java

Modified: 
openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java?rev=1597006&r1=1597005&r2=1597006&view=diff
==============================================================================
--- 
openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
 (original)
+++ 
openjpa/branches/2.2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaExpressionBuilder.java
 Fri May 23 04:04:17 2014
@@ -98,9 +98,9 @@ class CriteriaExpressionBuilder {
                         metas.add(meta);
                 }
             }
-            for (Fetch<?,?> fetch : root.getFetches()) {
-                
metas.add(metamodel.getRepository().getCachedMetaData(fetch.getAttribute().getJavaType()));
-            }
+//            for (Fetch<?,?> fetch : root.getFetches()) {
+//                
metas.add(metamodel.getRepository().getCachedMetaData(fetch.getAttribute().getJavaType()));
+//            }
         }
         exps.accessPath = metas.toArray(new ClassMetaData[metas.size()]);
     }