From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 7 Mar 2018 11:44:25 +0000 (+0200)
Subject: Always discard database undo history after each platform startup.
X-Git-Tag: v1.43.0~136^2~559
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=571533bb34f06bbe3e868dd730d4cf5e793039a4;hp=331d29f73e90a45b04b8f7f9845b9e6bd15cd4c2

Always discard database undo history after each platform startup.

refs #7792

Change-Id: I587d095dbb65e458ff70a4cdf14001f6bee13461
---

diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
index bce220c9c..9169c64b3 100644
--- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
+++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
@@ -341,12 +341,6 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor {
                 // Start the database garbage collector after a short while.
                 SessionGarbageCollectorJob.getInstance().scheduleAfterQuietTime();
 
-                // Discard database session undo history at this point to prevent
-                // the user from undoing any initialization operations performed
-                // by the platform startup.
-                SimanticsPlatform.INSTANCE.discardSessionUndoHistory();
-                TimeLogger.log("Discarded session undo history");
-
                 // #6353: Workaround for  
                 fixBindings();
 
diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
index 54b960547..211b286a9 100644
--- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
+++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
@@ -65,7 +65,6 @@ import org.simantics.db.VirtualGraph;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.Queries;
-import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.request.WriteResultRequest;
 import org.simantics.db.common.utils.Transaction;
 import org.simantics.db.exception.ClusterSetExistException;
@@ -914,6 +913,12 @@ public class SimanticsPlatform implements LifecycleListener {
         // #7650: improve shutdown robustness in all applications that use the platform
         Runtime.getRuntime().addShutdownHook(shutdownHook);
 
+        // Discard database session undo history at this point to prevent
+        // the user from undoing any initialization operations performed
+        // by the platform startup.
+        SimanticsPlatform.INSTANCE.discardSessionUndoHistory();
+        TimeLogger.log("Discarded session undo history");
+
         return sessionContext;
 
     }