From a4c65e93ad56fe4f0e43c9b173a218b31e9a33b2 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Fri, 16 Sep 2016 12:58:41 +0300 Subject: [PATCH] Sync git svn branch with SVN repository r33200. refs #6493 --- .../scl/compiler/module/repository/ModuleRepository.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java index 5078d0080..86b1ba766 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java @@ -177,11 +177,15 @@ public class ModuleRepository { } public void dispose() { - listeners.clear(); + if (listeners != null) + listeners.clear(); listeners = null; source = null; compilationResult = null; - runtimeModule.getResult().dispose(); + if (runtimeModule != null) { + if (runtimeModule.didSucceed()) + runtimeModule.getResult().dispose(); + } runtimeModule = null; } -- 2.43.2