From ffc59108e61d46aabba25ed337d72d6908b7c874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Thu, 10 May 2012 15:05:42 +0200
Subject: Fix race condition in MasterController.

---
 same/src/main/java/com/orbekk/same/SameController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 1cd16fc..2dc31ed 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -94,8 +94,8 @@ public class SameController {
             master = Master.create(connections,
                     masterUrl, configuration.get("networkName"), myLocation,
                     masterRpcf);
-            master.resumeFrom(lastKnownState, masterId);
             pServer.registerService(master.getNewService());
+            master.resumeFrom(lastKnownState, masterId);
             master.start();
             registerNetwork(master);
         }
-- 
cgit v1.2.3