X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FGraphClientImpl2.java;h=09929f775b728ab02a9f808d5b3576d7cb1a6cd2;hb=8568b9f55095fcab15eb28d16bcf67b64844eca3;hp=dce477ebeae0fdf35d1db078acfd7e6e885ea825;hpb=e1ec84d6bf6180c486a7c63ae9379d9f32577a23;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
index dce477ebe..09929f775 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/GraphClientImpl2.java
@@ -192,7 +192,7 @@ public class GraphClientImpl2 implements Database.Session {
 			try {
 			    if (!unexpectedClose)
 			        makeSnapshot(true);
-				
+
 				mainProgram.close();
 				clusters.shutdown();
 				executor.shutdown();
@@ -200,8 +200,14 @@ public class GraphClientImpl2 implements Database.Session {
 				boolean executorTerminated = executor.awaitTermination(500, TimeUnit.MILLISECONDS);
 				boolean saverTerminated = saver.awaitTermination(500, TimeUnit.MILLISECONDS);
 				
-				System.err.println("executorTerminated=" + executorTerminated + ", saverTerminated=" + saverTerminated);
-				
+				LOGGER.info("executorTerminated=" + executorTerminated + ", saverTerminated=" + saverTerminated);
+
+				try {
+					clusters.mainState.save(dbFolder);
+				} catch (IOException e) {
+					LOGGER.error("Failed to save " + MainState.MAIN_STATE + " file in database folder " + dbFolder);
+				}
+
 				mainProgram = null;
 				executor = null;
 				saver = null;
@@ -625,7 +631,7 @@ public class GraphClientImpl2 implements Database.Session {
 		    		final int changeSetId = clusters.state.headChangeSetId;
 		    		
 		    		if(ClusterUpdateProcessorBase.DEBUG)
-		    			System.err.println(" === BEGIN UNDO ===");
+		    			LOGGER.info(" === BEGIN UNDO ===");
 		    		
 		    		for(int i=0;i<changeSetIds.length;i++) {
 		    			final long id = changeSetIds[changeSetIds.length-1-i];
@@ -635,7 +641,7 @@ public class GraphClientImpl2 implements Database.Session {
 		    				String ccsid = ccss.get(ccss.size()-j-1);
 		    				try {
 		    					if(ClusterUpdateProcessorBase.DEBUG)
-		    						System.err.println("performUndo " + ccsid);
+		    						LOGGER.info("performUndo " + ccsid);
 		    					performUndo(ccsid, clusterChanges, support);
 		    				} catch (DatabaseException e) {
 		    					e.printStackTrace();
@@ -644,7 +650,7 @@ public class GraphClientImpl2 implements Database.Session {
 		    		}
 		    
 		    		if(ClusterUpdateProcessorBase.DEBUG)
-		    			System.err.println(" === END UNDO ===");
+		    			LOGGER.info(" === END UNDO ===");
 		    
 		    		for(int i=0;i<clusterChanges.size();i++) {