Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/BinaryRead.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/BinaryRead.java
index 11d629a0c7b31eb1c6c237b4586810f86ad58612..9ca69db5f94e2cb6b2ca3ca8b03892bb30aa873d 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/BinaryRead.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/BinaryRead.java
@@ -1,65 +1,65 @@
-/*******************************************************************************\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
-\r
-\r
-abstract public class BinaryRead<P1, P2, R> extends GenericReadBase<P1, R> {\r
-\r
-    final protected P1 parameter;\r
-    final protected P2 parameter2;\r
-    \r
-    private int hashCode;\r
-\r
-    @Override\r
-    public int hashCode() {\r
-       if(hashCode == 0) {\r
-               final int h1 = parameter != null ? parameter.hashCode() : 0;\r
-               final int h2 = parameter2 != null ? parameter2.hashCode() : 0;\r
-               hashCode = getClass().hashCode() + 31*(h1 + 31 * h2);\r
-       }\r
-       return 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
-        BinaryRead<?, ?, ?> r = (BinaryRead<?, ?, ?>) object;\r
-        \r
-        if(hashCode() != r.hashCode()) return false;\r
-        \r
-        if(parameter != null) {\r
-            if(!parameter.equals(r.parameter)) return false;\r
-        } else if(r.parameter != null) return false;\r
-        if(parameter2 != null) {\r
-            if(!parameter2.equals(r.parameter2)) return false;\r
-        } else if(r.parameter2 != null) return false;\r
-        return true;\r
-        \r
-    }\r
-\r
-    public BinaryRead(P1 parameter1, P2 parameter2) {\r
-        this.parameter = parameter1;\r
-        this.parameter2 = parameter2;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-       return getClass().getSimpleName() + "$" + parameter + "$" + parameter2; \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;
+
+
+
+abstract public class BinaryRead<P1, P2, R> extends GenericReadBase<P1, R> {
+
+    final protected P1 parameter;
+    final protected P2 parameter2;
+    
+    private int hashCode;
+
+    @Override
+    public int hashCode() {
+       if(hashCode == 0) {
+               final int h1 = parameter != null ? parameter.hashCode() : 0;
+               final int h2 = parameter2 != null ? parameter2.hashCode() : 0;
+               hashCode = getClass().hashCode() + 31*(h1 + 31 * h2);
+       }
+       return 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;
+        BinaryRead<?, ?, ?> r = (BinaryRead<?, ?, ?>) object;
+        
+        if(hashCode() != r.hashCode()) return false;
+        
+        if(parameter != null) {
+            if(!parameter.equals(r.parameter)) return false;
+        } else if(r.parameter != null) return false;
+        if(parameter2 != null) {
+            if(!parameter2.equals(r.parameter2)) return false;
+        } else if(r.parameter2 != null) return false;
+        return true;
+        
+    }
+
+    public BinaryRead(P1 parameter1, P2 parameter2) {
+        this.parameter = parameter1;
+        this.parameter2 = parameter2;
+    }
+
+    @Override
+    public String toString() {
+       return getClass().getSimpleName() + "$" + parameter + "$" + parameter2; 
+    }
+    
+}