X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fvariable%2FStandardRVIResolver.java;h=b01aeb32b3c810c6347b96aa01bb6bc2e8feb41c;hb=85c1daf4b3d4a48613e0c61c359cb8aac2157f01;hp=7c632f3f43b26bdc4c40f5f161cad268f962ff98;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardRVIResolver.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardRVIResolver.java
index 7c632f3f4..b01aeb32b 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardRVIResolver.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardRVIResolver.java
@@ -32,9 +32,9 @@ public class StandardRVIResolver implements RVIResolver {
     
     @Override
     public RVI getRVI(ReadGraph graph, Variable variable) throws DatabaseException {
-        Databoard databoard = graph.getService( Databoard.class );
-        Binding rviBinding = databoard.getBindingUnchecked( RVI.class );
         if(Variables.isContext(graph, variable)) {
+            Databoard databoard = graph.getService( Databoard.class );
+            Binding rviBinding = databoard.getBindingUnchecked( RVI.class );
             return RVI.empty( rviBinding );
         } else {
             Variable parent = variable.getParent(graph);
@@ -49,9 +49,9 @@ public class StandardRVIResolver implements RVIResolver {
 
     @Override
     public RVI getPossibleRVI(ReadGraph graph, Variable variable) throws DatabaseException {
-        Databoard databoard = graph.getService( Databoard.class );
-        Binding rviBinding = databoard.getBindingUnchecked( RVI.class );
         if(Variables.isContext(graph, variable)) {
+            Databoard databoard = graph.getService( Databoard.class );
+            Binding rviBinding = databoard.getBindingUnchecked( RVI.class );
             return RVI.empty( rviBinding );
         } else {
             Variable parent = variable.getParent(graph);