From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 16 Sep 2016 09:58:41 +0000 (+0300)
Subject: Sync git svn branch with SVN repository r33200.
X-Git-Tag: v1.25.0~112^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=a4c65e93ad56fe4f0e43c9b173a218b31e9a33b2;ds=sidebyside

Sync git svn branch with SVN repository r33200.

refs #6493
---

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