Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceRead.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceRead.java
index 90b5b33770d168d6d8a11f8d192c1df54a72dcca..6b23fc64226620a9bf194ff35162e9c38be65f56 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceRead.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceRead.java
@@ -1,54 +1,54 @@
-/*******************************************************************************\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.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-\r
-public abstract class ResourceRead<T> extends ResourceReadBase<T> {\r
-\r
-    final protected Resource resource;\r
-    \r
-    @Override\r
-    public int hashCode() {\r
-        return resource.hashCode() + classHash();\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
-        ResourceRead<?> r = (ResourceRead<?>) object;\r
-        return resource.equals(r.resource);\r
-    }\r
-\r
-    protected ResourceRead(Resource resource) {\r
-       if(resource == null) throw new IllegalArgumentException("Null resource.");\r
-        this.resource = resource;\r
-    }\r
-    \r
-    @Override\r
-    final public boolean isImmutable(ReadGraph graph) throws DatabaseException {\r
-       return graph.isImmutable(resource);\r
-    }\r
-\r
-    @Override\r
-    final public String toString() {\r
-       return getClass().getSimpleName() + "|" + resource; \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.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+
+public abstract class ResourceRead<T> extends ResourceReadBase<T> {
+
+    final protected Resource resource;
+    
+    @Override
+    public int hashCode() {
+        return resource.hashCode() + classHash();
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (this == object)
+            return true;
+        else if (object == null)
+            return false;
+        else if (getClass() != object.getClass())
+            return false;
+        ResourceRead<?> r = (ResourceRead<?>) object;
+        return resource.equals(r.resource);
+    }
+
+    protected ResourceRead(Resource resource) {
+       if(resource == null) throw new IllegalArgumentException("Null resource.");
+        this.resource = resource;
+    }
+    
+    @Override
+    final public boolean isImmutable(ReadGraph graph) throws DatabaseException {
+       return graph.isImmutable(resource);
+    }
+
+    @Override
+    final public String toString() {
+       return getClass().getSimpleName() + "|" + resource; 
+    }
+    
+}