X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FClusterManager.java;h=9725ffe8da2df0aabb169b301b955642781205dd;hb=96d8636ef6a7af10b65ad0878bebeee51891790d;hp=4c8df933777742532fcbf598f386362b81adafb5;hpb=2aa77c56ec691aad39d1909bfbe4aff101e988fb;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
index 4c8df9337..9725ffe8d 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
@@ -406,35 +406,39 @@ public class ClusterManager {
 		lastSessionDirectory = dbFolder.resolve(Integer.toString(mainState.headDir - 1));
 		
 		// Head State
-		try {
-            state = HeadState.load(lastSessionDirectory);
-        } catch (InvalidHeadStateException e) {
-            // For backwards compatibility only!
-            Throwable cause = e.getCause();
-            if (cause instanceof Throwable) {
-                try {
-                    org.simantics.db.javacore.HeadState oldState = org.simantics.db.javacore.HeadState.load(lastSessionDirectory);
-                    
-                    HeadState newState = new HeadState();
-                    newState.clusters = oldState.clusters;
-                    newState.cs = oldState.cs;
-                    newState.files = oldState.files;
-                    newState.stream = oldState.stream;
-                    newState.headChangeSetId = oldState.headChangeSetId;
-                    newState.reservedIds = oldState.reservedIds;
-                    newState.transactionId = oldState.transactionId;
-                    state = newState;
-                } catch (InvalidHeadStateException e1) {
-                    throw new IOException("Could not load HeadState due to corruption", e1);
-                }
-            } else {
-                // This should never happen as MainState.load() checks the integrity
-                // of head.state files and rolls back in cases of corruption until a
-                // consistent state is found (could be case 0 - initial db state)
-                // IF this does happen something is completely wrong
-                throw new IOException("Could not load HeadState due to corruption", e);
-            }
-        }
+		if (mainState.isInitial()) {
+			state = new HeadState();
+		} else {
+			try {
+	            state = HeadState.load(lastSessionDirectory);
+	        } catch (InvalidHeadStateException e) {
+	            // For backwards compatibility only!
+	            Throwable cause = e.getCause();
+	            if (cause instanceof Throwable) {
+	                try {
+	                    org.simantics.db.javacore.HeadState oldState = org.simantics.db.javacore.HeadState.load(lastSessionDirectory);
+	                    
+	                    HeadState newState = new HeadState();
+	                    newState.clusters = oldState.clusters;
+	                    newState.cs = oldState.cs;
+	                    newState.files = oldState.files;
+	                    newState.stream = oldState.stream;
+	                    newState.headChangeSetId = oldState.headChangeSetId;
+	                    newState.reservedIds = oldState.reservedIds;
+	                    newState.transactionId = oldState.transactionId;
+	                    state = newState;
+	                } catch (InvalidHeadStateException e1) {
+	                    throw new IOException("Could not load HeadState due to corruption", e1);
+	                }
+	            } else {
+	                // This should never happen as MainState.load() checks the integrity
+	                // of head.state files and rolls back in cases of corruption until a
+	                // consistent state is found (could be case 0 - initial db state)
+	                // IF this does happen something is completely wrong
+	                throw new IOException("Could not load HeadState due to corruption", e);
+	            }
+	        }
+		}
 		try {
     		workingDirectory = dbFolder.resolve(Integer.toString(mainState.headDir));
     		Files.createDirectories(workingDirectory);