Replace System.err and System.out with SLF4J Logging

[simantics/platform.git] / bundles / org.simantics.acorn / src / org / simantics / acorn / GraphClientImpl2.java

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 dce477ebeae0fdf35d1db078acfd7e6e885ea825..09929f775b728ab02a9f808d5b3576d7cb1a6cd2 100644 (file)
--- 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++) {