Merge "Fixed database request threading issue in FlagUtil.join" into release/1.35.1

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java
index 2d6c91e61e7dc1e6833a4d4404d97461c3e3c293..d38a301da3c4a9d93dc60c2de926eaa41af5aea7 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java
@@ -186,9 +186,9 @@ public final class FlagUtil {
 
         IActivationManager manager = g.getService(IActivationManager.class);
         for(Resource diagram : OrderedSetUtils.getSubjects(g, flag))
-            manager.activateOnce(diagram);
+            manager.activateOnce(g, diagram);
         for(Resource diagram : OrderedSetUtils.getSubjects(g, otherFlag))
-            manager.activateOnce(diagram);
+            manager.activateOnce(g, diagram);
         return connectionJoin;
     }