diff options
| author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-10 15:05:42 +0200 |
|---|---|---|
| committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-10 15:05:42 +0200 |
| commit | ffc59108e61d46aabba25ed337d72d6908b7c874 (patch) | |
| tree | 036fbdaa0ce173e1b8a1e8d98bc6ea54f31f3ee7 /same/src/main/java | |
| parent | 18f9092fe0c52396dbc1d7978533ab1d8c61f76b (diff) | |
Fix race condition in MasterController.
Diffstat (limited to 'same/src/main/java')
| -rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |