Fix ROP compatibility with QueryCache changes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2ac3c977 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2ac3c977 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2ac3c977 Branch: refs/heads/querycache Commit: 2ac3c9776c6dd830b071ede26cb6154870c40032 Parents: be51331 Author: John Huss <johnth...@apache.org> Authored: Wed May 2 15:25:17 2018 -0500 Committer: John Huss <johnth...@apache.org> Committed: Wed May 2 15:25:17 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/cayenne/CayenneContextQueryAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/2ac3c977/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java ---------------------------------------------------------------------- diff --git a/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java b/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java index e0b693c..ced71d5 100644 --- a/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java +++ b/cayenne-rop-server/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java @@ -26,6 +26,7 @@ import java.util.List; import org.apache.cayenne.cache.QueryCacheEntryFactory; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.query.Query; +import org.apache.cayenne.query.QueryMetadata; import org.apache.cayenne.query.RefreshQuery; import org.apache.cayenne.reflect.AttributeProperty; import org.apache.cayenne.reflect.ClassDescriptor; @@ -108,10 +109,9 @@ class CayenneContextQueryAction extends ObjectContextQueryAction { if (refreshQuery.getQuery() != null) { Query cachedQuery = refreshQuery.getQuery(); - String cacheKey = cachedQuery - .getMetaData(context.getEntityResolver()) - .getCacheKey(); - context.getQueryCache().remove(cacheKey); + QueryMetadata metadata = cachedQuery + .getMetaData(context.getEntityResolver()); + context.getQueryCache().remove(metadata); this.response = context.performGenericQuery(cachedQuery);
