X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2FStandardSessionManager.java;h=cdd8e074c404ee4d698878b37eaf7d7478c36eca;hp=0f9a919a3f2d881392c8b5313d7a90878dfc0555;hb=82ed7c74dbd83a2a557e781b8674b3262b52da54;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/StandardSessionManager.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/StandardSessionManager.java
index 0f9a919a3..cdd8e074c 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/StandardSessionManager.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/StandardSessionManager.java
@@ -1,116 +1,123 @@
-package org.simantics.db.layer0;
-
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.common.request.ParametrizedPrimitiveRead;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.variable.NodeSupport;
-import org.simantics.db.procedure.Listener;
-
-abstract public class StandardSessionManager<Node, Engine extends StandardEngine<Node>> {
-
-    private ConcurrentHashMap<String, Listener<StandardRealm<Node,Engine>>> realmListeners = new ConcurrentHashMap<>();
-    private ConcurrentHashMap<String, StandardRealm<Node,Engine>> REALMS = new ConcurrentHashMap<String, StandardRealm<Node,Engine>>(); 
-    private ConcurrentHashMap<String, NodeSupport<Node>> SUPPORTS = new ConcurrentHashMap<String, NodeSupport<Node>>(); 
-
-    // Accessing Realms should be done over ParametrizedPrimitveRead for the
-    // case if a realm is destroyed and new one is created with the same id than
-    // the previously deleted one for the listeners to get discarded and new
-    // registered
-    private class RealmRequest extends ParametrizedPrimitiveRead<String, StandardRealm<Node, Engine>> {
-
-        public RealmRequest(String parameter) {
-            super(parameter);
-        }
-
-        @Override
-        public void register(ReadGraph graph, Listener<StandardRealm<Node, Engine>> procedure) {
-
-            StandardRealm<Node, Engine> realm = REALMS.get(parameter);
-            if (realm == null) {
-                try {
-                    realm = createRealmInner(graph, parameter);
-                } catch (DatabaseException e) {
-                    e.printStackTrace();
-                }
-            }
-            
-            if(procedure.isDisposed()) {
-                procedure.execute(realm);
-                return;
-            }
-            
-            Listener<StandardRealm<Node,Engine>> existing = getOrDisposeListener(parameter);
-            assert(existing == null);
-            realmListeners.put(parameter, procedure);
-            procedure.execute(realm);
-        }
-
-        private StandardRealm<Node,Engine> createRealmInner(ReadGraph graph, String id) throws DatabaseException {
-            Engine engine = createEngine(graph, id);
-            StandardRealm<Node,Engine> realm = createRealm(engine, id);
-            modifyRealms(id, realm);
-            return realm;
-        }
-    }
-    
-    protected StandardSessionManager() {
-    }
-    
-    private Listener<StandardRealm<Node,Engine>> getOrDisposeListener(String key) {
-        Listener<StandardRealm<Node,Engine>> listener = realmListeners.get(key);
-        if(listener != null) {
-            if(listener.isDisposed()) {
-                realmListeners.remove(key);
-            } else {
-                return listener;
-            }
-        }
-        return null;
-    }
-    
-    private void modifyRealms(String key, StandardRealm<Node,Engine> realm) {
-        if(realm != null) {
-            REALMS.put(key, realm);
-        } else {
-            REALMS.remove(key);
-        }
-        Listener<StandardRealm<Node,Engine>> listener = getOrDisposeListener(key);
-        if(listener != null) {
-            listener.execute(realm);
-        }
-    }
-
-    public NodeSupport<Node> getOrCreateNodeSupport(ReadGraph graph, String id) throws DatabaseException {
-        synchronized(SUPPORTS) {
-        	NodeSupport<Node> result = SUPPORTS.get(id);
-        	if(result == null) {
-        		StandardRealm<Node,Engine> realm = getOrCreateRealm(graph, id);
-        		result = new NodeSupport<Node>(realm.getNodeManager());
-        		SUPPORTS.put(id, result);
-        	}
-    		return result;
-        }
-    }
-    
-    public StandardRealm<Node,Engine> getOrCreateRealm(ReadGraph graph, String id) throws DatabaseException {
-        synchronized(REALMS) {
-            return graph.syncRequest(new RealmRequest(id));
-        }
-    }
-    
-    protected abstract Engine createEngine(ReadGraph graph, String id) throws DatabaseException;
-    protected abstract StandardRealm<Node,Engine> createRealm(Engine engine, String id);
-    
-    public void removeRealm(String id) {
-        modifyRealms(id, null);
-        // if node support has been created remove it as well
-        SUPPORTS.remove(id);
-    }
-    
-    public Collection<String> getRealms() {
-        return REALMS.keySet();
-    }
-}
+package org.simantics.db.layer0;
+
+import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.ParametrizedPrimitiveRead;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.NodeSupport;
+import org.simantics.db.procedure.Listener;
+
+abstract public class StandardSessionManager<Node, Engine extends StandardEngine<Node>> {
+
+    private ConcurrentHashMap<String, Listener<StandardRealm<Node,Engine>>> realmListeners = new ConcurrentHashMap<>();
+    private ConcurrentHashMap<String, StandardRealm<Node,Engine>> REALMS = new ConcurrentHashMap<String, StandardRealm<Node,Engine>>(); 
+    private ConcurrentHashMap<String, NodeSupport<Node>> SUPPORTS = new ConcurrentHashMap<String, NodeSupport<Node>>(); 
+
+    // Accessing Realms should be done over ParametrizedPrimitveRead for the
+    // case if a realm is destroyed and new one is created with the same id than
+    // the previously deleted one for the listeners to get discarded and new
+    // registered
+    private class RealmRequest extends ParametrizedPrimitiveRead<String, StandardRealm<Node, Engine>> {
+
+        public RealmRequest(String parameter) {
+            super(parameter);
+        }
+
+        @Override
+        public void register(ReadGraph graph, Listener<StandardRealm<Node, Engine>> procedure) {
+
+            StandardRealm<Node, Engine> realm = REALMS.get(parameter);
+            if (realm == null) {
+                try {
+                    realm = createRealmInner(graph, parameter);
+                } catch (DatabaseException e) {
+                    e.printStackTrace();
+                }
+            }
+            
+            if(procedure.isDisposed()) {
+                procedure.execute(realm);
+                return;
+            }
+            
+            Listener<StandardRealm<Node,Engine>> existing = getOrDisposeListener(parameter);
+            assert(existing == null);
+            realmListeners.put(parameter, procedure);
+            procedure.execute(realm);
+        }
+
+        private StandardRealm<Node,Engine> createRealmInner(ReadGraph graph, String id) throws DatabaseException {
+            Engine engine = createEngine(graph, id);
+            StandardRealm<Node,Engine> realm = createRealm(engine, id);
+            modifyRealms(id, realm);
+            return realm;
+        }
+    }
+    
+    protected StandardSessionManager() {
+    }
+    
+    private Listener<StandardRealm<Node,Engine>> getOrDisposeListener(String key) {
+        Listener<StandardRealm<Node,Engine>> listener = realmListeners.get(key);
+        if(listener != null) {
+            if(listener.isDisposed()) {
+                realmListeners.remove(key);
+            } else {
+                return listener;
+            }
+        }
+        return null;
+    }
+    
+    private void modifyRealms(String key, StandardRealm<Node,Engine> realm) {
+        if(realm != null) {
+            REALMS.put(key, realm);
+        } else {
+            StandardRealm<Node, Engine> removedRealm = REALMS.remove(key);
+            if (removedRealm != null)
+                removedRealm.close();
+        }
+        Listener<StandardRealm<Node,Engine>> listener = getOrDisposeListener(key);
+        if(listener != null) {
+            listener.execute(realm);
+        }
+    }
+
+    public NodeSupport<Node> getOrCreateNodeSupport(ReadGraph graph, String id) throws DatabaseException {
+        synchronized(SUPPORTS) {
+        	NodeSupport<Node> result = SUPPORTS.get(id);
+        	if(result == null) {
+        		StandardRealm<Node,Engine> realm = getOrCreateRealm(graph, id);
+        		result = new NodeSupport<Node>(realm.getNodeManager());
+        		SUPPORTS.put(id, result);
+        	}
+    		return result;
+        }
+    }
+    
+    public StandardRealm<Node,Engine> getOrCreateRealm(ReadGraph graph, String id) throws DatabaseException {
+        synchronized(REALMS) {
+            return graph.syncRequest(new RealmRequest(id));
+        }
+    }
+    
+    protected abstract Engine createEngine(ReadGraph graph, String id) throws DatabaseException;
+    protected abstract StandardRealm<Node,Engine> createRealm(Engine engine, String id);
+    
+    public void removeRealm(WriteGraph graph, String id) throws DatabaseException {
+        modifyRealms(id, null);
+        // remove listeners from this realm
+        realmListeners.remove(id);
+        // if node support has been created remove it as well
+        NodeSupport<Node> support = SUPPORTS.remove(id);
+        if (support != null)
+            support.dispose();
+    }
+    
+    public Collection<String> getRealms() {
+        return REALMS.keySet();
+    }
+}