Merge "Save cluster sets only when creating DB snapshots"

diff --combined bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
index c414dd2b601a834a1de15d55be218535721b349d,3cbb64977ae203d3f55efa879e8ec56331477be6..22629d4e64237ab63c6fc89a12f0754087254edb
--- 1/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
--- 2/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
@@@ -35,12 -35,8 +35,12 @@@ import org.simantics.db.service.Cluster
  import org.simantics.db.service.ClusterUID;
  import org.simantics.utils.threads.logger.ITask;
  import org.simantics.utils.threads.logger.ThreadLogger;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
  public class ClusterManager {
 +    
 +    final static Logger LOGGER = LoggerFactory.getLogger(ClusterManager.class); 
  
        private ArrayList<String> currentChanges = new ArrayList<String>();
  
@@@ -147,12 -143,12 +147,12 @@@
                // Cluster files are always there 
                // Nothing has been written => no need to do anything
                long amountOfFiles = countFiles(workingDirectory);
-               if(!fullSave && amountOfFiles < 3) {
+               if(!fullSave && amountOfFiles == 0) {
      //                    System.err.println("amountOfFiles < 3");
                    return false;
                }
      
 -              System.err.println("makeSnapshot");
 +              LOGGER.info("makeSnapshot");
      
                // Schedule writing of all data to disk
              refreshHeadState();
@@@ -167,17 -163,17 +167,17 @@@
                if (!safeToMakeSnapshot.get())
                    throw cause;
                
+               ClusterSetsSupport cssi = locator.getService(ClusterSetsSupport.class); 
+               cssi.save();
+ 
                persistHeadState();
-               
+ 
                if (fullSave)
                    mainState.save(dbFolder);
      
-               ClusterSetsSupport cssi = locator.getService(ClusterSetsSupport.class); 
-               cssi.save();
-     
                amountOfFiles = countFiles(workingDirectory);
                
 -              System.err.println(" -finished: amount of files is " + amountOfFiles);
 +              LOGGER.info(" -finished: amount of files is {}", amountOfFiles);
      
                workingDirectory = dbFolder.resolve(Integer.toString(mainState.headDir));
                if (!Files.exists(workingDirectory)) {