Correctly locked the snapshot on shutdown

spoutdev · Aug 2, 2012 · a3ce848 · a3ce848
1 parent 575a30f
commit a3ce848
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/spout/engine/scheduler/SpoutScheduler.java b/src/main/java/org/spout/engine/scheduler/SpoutScheduler.java
@@ -233,6 +233,7 @@ public void run() {
 				Spout.getLogger().log(Level.SEVERE, "Interrupt while running final snapshot copy: {0}", ex.getMessage());
 			}
 
+			TickStage.setStage(TickStage.TICKSTART);
 			runLastTickTasks();
 
 			asyncExecutors.copySnapshot();
@@ -255,7 +256,7 @@ public void run() {
 			}
 
 			try {
-				copySnapshot(asyncExecutors.get());
+				copySnapshotWithLock(asyncExecutors.get());
 			} catch (InterruptedException ex) {
 				Spout.getLogger().log(Level.SEVERE, "Error while halting all executors: {0}", ex.getMessage());
 			}
@@ -274,7 +275,7 @@ public void run() {
 			}
 
 			try {
-				copySnapshot(asyncExecutors.get());
+				copySnapshotWithLock(asyncExecutors.get());
 			} catch (InterruptedException ex) {
 				engine.getLogger().log(Level.SEVERE, "Error while shutting down engine: {0}", ex.getMessage());
 			}