Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SyncIntProcedure.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SyncIntProcedure.java
index f26a703dd22bf694e7cc7212f551a99582042adf..c03f63b5ea56497ec236611aa58463bb3c44b2a8 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SyncIntProcedure.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SyncIntProcedure.java
@@ -1,44 +1,44 @@
-/*******************************************************************************\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.impl.query;\r
-\r
-import org.simantics.db.impl.graph.ReadGraphImpl;\r
-\r
-\r
-abstract public class SyncIntProcedure implements IntProcedure, ThreadRunnable {\r
-\r
-       int barrier = 1;\r
-//     \r
-//    final private AtomicInteger barrier = new AtomicInteger(1);\r
-    \r
-    public SyncIntProcedure() {\r
-    }\r
-    \r
-    final protected void inc() {\r
-//     System.err.println("inc " + barrier.get());\r
-       ++barrier;\r
-//     barrier.incrementAndGet();\r
-    }\r
-    \r
-    final protected void dec(ReadGraphImpl graph) {\r
-//     System.err.println("dec " + barrier.get());\r
-       if((--barrier) == 0) {\r
-            run(graph);\r
-       }\r
-    }\r
-    \r
-    @Override\r
-    public void exception(ReadGraphImpl graph, Throwable t) {\r
-       throw new Error("Errors are not supported,", t);\r
-    }\r
-    \r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 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.impl.query;
+
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.impl.graph.ReadGraphImpl;
+
+public abstract class SyncIntProcedure implements IntProcedure, ThreadRunnable {
+
+       int barrier = 1;
+
+//    final private AtomicInteger barrier = new AtomicInteger(1);
+
+    public SyncIntProcedure() {
+    }
+
+    protected final void inc() {
+//        System.err.println("inc " + barrier.get());
+       ++barrier;
+//        barrier.incrementAndGet();
+    }
+
+    protected final void dec(ReadGraphImpl graph) throws DatabaseException {
+//        System.err.println("dec " + barrier.get());
+        if((--barrier) == 0) {
+            run(graph);
+        }
+    }
+
+    @Override
+    public void exception(ReadGraphImpl graph, Throwable t) throws DatabaseException {
+        throw new Error("Errors are not supported,", t);
+    }
+
+}