Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.db.common / src / org / simantics / db / common / request / ResourceAsyncMultiRead2.java

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncMultiRead2.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncMultiRead2.java
index 1dae0fc56f5ef77733c367b28875854cee35f570..fdb1e893bd1875a9316121b4234eb927bb9945f1 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncMultiRead2.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncMultiRead2.java
@@ -1,42 +1,42 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.db.common.request;\r
-\r
-import org.simantics.db.Resource;\r
-\r
-abstract public class ResourceAsyncMultiRead2<T> extends ResourceAsyncMultiRead<T> {\r
-\r
-    final protected Resource resource2;\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        return resource.hashCode() ^ resource2.hashCode();\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object object) {\r
-        if (this == object)\r
-            return true;\r
-        else if (object == null)\r
-            return false;\r
-        else if (getClass() != object.getClass())\r
-            return false;\r
-        ResourceAsyncMultiRead2<?> r = (ResourceAsyncMultiRead2<?>)object;\r
-        return resource.equals(r.resource) && resource2.equals(r.resource2);\r
-    }\r
-\r
-    public ResourceAsyncMultiRead2(Resource resource, Resource predicate) {\r
-        super(resource);\r
-        this.resource2 = predicate;\r
-    }\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.common.request;
+
+import org.simantics.db.Resource;
+
+abstract public class ResourceAsyncMultiRead2<T> extends ResourceAsyncMultiRead<T> {
+
+    final protected Resource resource2;
+
+    @Override
+    public int hashCode() {
+        return resource.hashCode() ^ resource2.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (this == object)
+            return true;
+        else if (object == null)
+            return false;
+        else if (getClass() != object.getClass())
+            return false;
+        ResourceAsyncMultiRead2<?> r = (ResourceAsyncMultiRead2<?>)object;
+        return resource.equals(r.resource) && resource2.equals(r.resource2);
+    }
+
+    public ResourceAsyncMultiRead2(Resource resource, Resource predicate) {
+        super(resource);
+        this.resource2 = predicate;
+    }
+
+}