Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DoubleKeyQueryHashMap.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DoubleKeyQueryHashMap.java
index f1aa887bba51ac1f425e7de97e74869fb7a528c0..d59f5beb80a3e54e2246785fc997a0bb3d9ab105 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DoubleKeyQueryHashMap.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DoubleKeyQueryHashMap.java
@@ -193,9 +193,9 @@ public class DoubleKeyQueryHashMap<Procedure> extends DoubleKeyQueryHash<Procedu
        
     }
 
-    final public ArrayList<CacheEntry> values() {
+    final public <T extends BinaryQuery> ArrayList<T> values() {
 
-       ArrayList<CacheEntry> result = new ArrayList<CacheEntry>();
+       ArrayList<T> result = new ArrayList<T>();
        
         for (int i = _set.length; i-- > 0;) {
             if(_set[i] != null && _set[i] != REMOVED) {