Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AsyncReadRequest.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AsyncReadRequest.java
index 590554bd62925d40bea38442ee50387ab7288035..4b92bbea1e0ac239dfd6102ad4268b1b7ac45fd7 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AsyncReadRequest.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AsyncReadRequest.java
@@ -1,38 +1,43 @@
-/*******************************************************************************\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.AsyncReadGraph;\r
-import org.simantics.db.procedure.AsyncProcedure;\r
-import org.simantics.db.request.AsyncRead;\r
-\r
-public abstract class AsyncReadRequest implements AsyncRead<Object> {\r
-\r
-    @Override\r
-    final public void perform(AsyncReadGraph graph, AsyncProcedure<Object> procedure) {\r
-        run(graph);\r
-        procedure.execute(graph, null);\r
-    }\r
-    \r
-    @Override\r
-    public int getFlags() {\r
-        return 0;\r
-    }\r
-\r
-    @Override\r
-    public int threadHash() {\r
-       return hashCode();\r
-    }\r
-    \r
-    public abstract void run(AsyncReadGraph graph);\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.AsyncReadGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.db.request.AsyncRead;
+
+public abstract class AsyncReadRequest implements AsyncRead<Object> {
+
+    @Override
+    final public void perform(AsyncReadGraph graph, AsyncProcedure<Object> procedure) {
+        try {
+            run(graph);
+            procedure.execute(graph, null);
+        } catch (DatabaseException e) {
+            procedure.exception(graph, e);
+        }
+    }
+    
+    @Override
+    public int getFlags() {
+        return 0;
+    }
+
+    @Override
+    public int threadHash() {
+       return hashCode();
+    }
+    
+    public abstract void run(AsyncReadGraph graph) throws DatabaseException;
+
+}