diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-22 14:55:11 +0200 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-05-22 14:55:11 +0200 |
commit | 757fdedcb0256929bab8fc1c45a3f3c47cee0750 (patch) | |
tree | bfd239421833b5924b5677de10ad9df94320b69c /same/src/main/java/com/orbekk/same/SameController.java | |
parent | 2a751ab6932c96cbe5960fe3607955a8a1fc44c3 (diff) |
Add Experiment 2: Master recovery time.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index 04185db..8e6e977 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -115,8 +115,9 @@ public class SameController { private MasterController masterController = new MasterController() { @Override - public void enableMaster(String networkName, + public synchronized void enableMaster(String networkName, State lastKnownState, int masterId) { + disableMaster(); String myLocation = configuration.get("localIp") + ":" + configuration.get("pport"); String masterUrl = configuration.get("baseUrl") + @@ -131,7 +132,7 @@ public class SameController { } @Override - public void disableMaster() { + public synchronized void disableMaster() { if (master != null) { pServer.removeService(master.getNewService()); master.interrupt(); |