Merge branch 'master' into private/db-threads

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / ValueQuery.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
index d85595831851a5b87916d0edba978d2c67acef36..770a25cb93abc0e3fa75b2004efabc396da0fed2 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
@@ -24,14 +24,14 @@ final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
     }
     
     final static ValueQuery entry(final QueryProcessor provider, final int r) {
-        return (ValueQuery)provider.valueMap.get(r);
+        return (ValueQuery)provider.cache.valueMap.get(r);
     }
 
     final static byte[] runner(final ReadGraphImpl graph, final int r, CacheEntry parent, final ListenerBase listener, final InternalProcedure<byte[]> procedure) {
 
        QueryProcessor processor = graph.processor;
        
-       ValueQuery entry = (ValueQuery)processor.valueMap.get(r); 
+       ValueQuery entry = (ValueQuery)processor.cache.valueMap.get(r); 
         if(entry == null) {
                
                entry = new ValueQuery(r);
@@ -75,17 +75,17 @@ final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
     
        @Override
        public UnaryQuery<InternalProcedure<byte[]>> getEntry(QueryProcessor provider) {
-        return provider.valueMap.get(id);
+        return provider.cache.valueMap.get(id);
        }
        
        @Override
        public void putEntry(QueryProcessor provider) {
-        provider.valueMap.put(id, this);
+        provider.cache.valueMap.put(id, this);
        }
 
        @Override
        final public void removeEntry(QueryProcessor provider) {
-               provider.valueMap.remove(id);
+               provider.cache.valueMap.remove(id);
        }