X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fgenericrelation%2FExternalRequest.java;h=d7fa8b9356ac9b5db2a13a1de3e3dc688620e8b8;hb=1fb7e00de0895266e08097371c6f84e4322d6530;hp=b090c4a7602170ea33f699e80cfe0a3770773c5d;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/ExternalRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/ExternalRequest.java
index b090c4a76..d7fa8b935 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/ExternalRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/genericrelation/ExternalRequest.java
@@ -25,13 +25,15 @@ class ExternalRequest extends ParametrizedPrimitiveRead<Pair<GenericRelationInde
         }
         if(procedure.isDisposed()) return;
         assert(this.procedure == null);
-        this.session = graph.getSession();
         this.procedure = procedure;
+        this.session = graph.getSession();
         parameter.first.addListener(graph, parameter.second, this);
     }
     
     @Override
     public void unregistered() {
+    	if(session == null) return;
+//    		System.err.println("asd");
         parameter.first.removeListener(session, parameter.second, this);
     }