Merge pull request #44 from viatra/issues/synchronizer-leak

Ensures IncrementalTransformationSynchronizer cleanup on project close
viatra · Nov 5, 2019 · 0e1fbc0 · 0e1fbc0
2 parents faddc1f + 06b8fea
commit 0e1fbc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/com.incquerylabs.v4md/src/main/com/incquerylabs/v4md/V4MDPlugin.java b/com.incquerylabs.v4md/src/main/com/incquerylabs/v4md/V4MDPlugin.java
@@ -2,6 +2,7 @@
 
 import com.incquerylabs.v4md.expressions.BinaryVQLExpression;
 import com.incquerylabs.v4md.internal.IProjectChangedListener;
+import com.incquerylabs.v4md.transformations.IncrementalTransformationSynchronizer;
 import com.nomagic.ci.persistence.IProject;
 import com.nomagic.magicdraw.core.Application;
 import com.nomagic.magicdraw.core.Project;
@@ -18,6 +19,7 @@ private final class V4MDProjectListener extends ProjectEventListenerAdapter impl
 		@Override
 		public void projectPreClosed(Project project) {
 			// There is no need to explicitly initialize adapters; the dispose handles uninitialized adapters correctly
+			IncrementalTransformationSynchronizer.disposeSynchronizer(project);
 			ViatraQueryAdapter.disposeAdapter(project);
 		}
 

diff --git a/...src/main/com/incquerylabs/v4md/transformations/IncrementalTransformationSynchronizer.java b/...src/main/com/incquerylabs/v4md/transformations/IncrementalTransformationSynchronizer.java
@@ -56,6 +56,10 @@ private ViatraTransformationSynchronizerManager() {
 		public ModelSynchronizer apply(Project t) {
 			return (ModelSynchronizer) storage.computeIfAbsent(t, IncrementalTransformationSynchronizer::new);
 		}
+
+	}
+	public static void disposeSynchronizer(Project p) {
+		((ViatraTransformationSynchronizerManager)FACTORY).storage.remove(p);
 	}
 
 	private BatchTransformation transformation;