Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypedParent.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypedParent.java
index adab5eaa9510f642e8325b4aba1aada506d1b8e5..5662389a71f61d2d01c7622981185db23f0408ea 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypedParent.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypedParent.java
@@ -1,69 +1,69 @@
-/*******************************************************************************\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.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.procedure.AsyncProcedure;\r
-import org.simantics.layer0.Layer0;\r
-\r
-public class TypedParent extends ResourceAsyncRead2<Resource> {\r
-\r
-       public TypedParent(Resource resource, Resource type) {\r
-               super(resource, type);\r
-       }\r
-\r
-       @Override\r
-       public void perform(AsyncReadGraph graph, final AsyncProcedure<Resource> procedure) {\r
-\r
-           final Layer0 l0 = graph.getService(Layer0.class);\r
-\r
-               graph.forIsInstanceOf(resource, resource2, new AsyncProcedure<Boolean>() {\r
-\r
-                       @Override\r
-                       public void execute(AsyncReadGraph graph, Boolean isInstance) {\r
-                               if(isInstance) {\r
-                                       procedure.execute(graph, resource);\r
-                               } else {\r
-                                       graph.forPossibleObject(resource, l0.PartOf, new AsyncProcedure<Resource>() {\r
-\r
-                                               @Override\r
-                                               public void execute(AsyncReadGraph graph, final Resource parent) {\r
-\r
-                                                       if(parent == null) {\r
-                                                               procedure.exception(graph, new DatabaseException("Typed parent was not found."));\r
-                                                       } else {\r
-                                                               graph.asyncRequest(new TypedParent(parent, resource2), procedure);\r
-                                                       }\r
-                                                       \r
-                                               }\r
-\r
-                                               @Override\r
-                                               public void exception(AsyncReadGraph graph, Throwable throwable) {\r
-                                                       procedure.exception(graph, throwable);\r
-                                               }\r
-                                               \r
-                                       });\r
-                               }\r
-                       }\r
-\r
-                       @Override\r
-                       public void exception(AsyncReadGraph graph, Throwable throwable) {\r
-                               procedure.exception(graph, throwable);\r
-                       }\r
-               });\r
-               \r
-               \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.AsyncReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.layer0.Layer0;
+
+public class TypedParent extends ResourceAsyncRead2<Resource> {
+
+       public TypedParent(Resource resource, Resource type) {
+               super(resource, type);
+       }
+
+       @Override
+       public void perform(AsyncReadGraph graph, final AsyncProcedure<Resource> procedure) {
+
+           final Layer0 l0 = graph.getService(Layer0.class);
+
+               graph.forIsInstanceOf(resource, resource2, new AsyncProcedure<Boolean>() {
+
+                       @Override
+                       public void execute(AsyncReadGraph graph, Boolean isInstance) {
+                               if(isInstance) {
+                                       procedure.execute(graph, resource);
+                               } else {
+                                       graph.forPossibleObject(resource, l0.PartOf, new AsyncProcedure<Resource>() {
+
+                                               @Override
+                                               public void execute(AsyncReadGraph graph, final Resource parent) {
+
+                                                       if(parent == null) {
+                                                               procedure.exception(graph, new DatabaseException("Typed parent was not found."));
+                                                       } else {
+                                                               graph.asyncRequest(new TypedParent(parent, resource2), procedure);
+                                                       }
+                                                       
+                                               }
+
+                                               @Override
+                                               public void exception(AsyncReadGraph graph, Throwable throwable) {
+                                                       procedure.exception(graph, throwable);
+                                               }
+                                               
+                                       });
+                               }
+                       }
+
+                       @Override
+                       public void exception(AsyncReadGraph graph, Throwable throwable) {
+                               procedure.exception(graph, throwable);
+                       }
+               });
+               
+               
+       }
+
+}