[MMBASE SCM] r36475 - mmbase/trunk/core/src/main/java/org/mmbase/cache

[michiel]

Author: michiel
Date: 2009-06-29 16:36:40 +0200 (Mon, 29 Jun 2009)
New Revision: 36475

Modified:
   mmbase/trunk/core/src/main/java/org/mmbase/cache/QueryResultCache.java
Log:
formalized unwrapping a bit (and also wokring for bridge/util/QueryWrapper's

Modified: mmbase/trunk/core/src/main/java/org/mmbase/cache/QueryResultCache.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/cache/QueryResultCache.java      
2009-06-29 14:36:26 UTC (rev 36474)
+++ mmbase/trunk/core/src/main/java/org/mmbase/cache/QueryResultCache.java      
2009-06-29 14:36:40 UTC (rev 36475)
@@ -106,8 +106,8 @@
     @Override
     public List<MMObjectNode> put(SearchQuery query, List<MMObjectNode> 
queryResult) {
         query.markUsed();
-        if (query instanceof BasicQuery) {
-            query = ((BasicQuery) query).getQuery();
+        while (query instanceof SearchQueryWrapper) {
+            query = ((SearchQueryWrapper) query).unwrap();
         }
         if (!checkCachePolicy(query)) {
             return null;
@@ -126,8 +126,8 @@
      */
     @Override
     public List<MMObjectNode> remove(Object key) {
-        if (key instanceof BasicQuery) {
-            key = ((BasicQuery) key).getQuery();
+        while (key instanceof SearchQueryWrapper) {
+            key = ((SearchQueryWrapper) key).unwrap();
         }
         synchronized(lock) {
             List<MMObjectNode> result = super.remove(key);

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs