From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Sep 2016 09:59:21 +0000 (+0300)
Subject: Merge commit 'a4c65e9'
X-Git-Tag: v1.25.0~112
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=35a513a86eb0e30c29ebf094cc778b08e5bbded4;hp=abe6893036ad75927f61cfd542562d62ef3c5edc

Merge commit 'a4c65e9'
---

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;
         }