summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/SameController.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-17 17:05:32 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-04-17 17:05:32 +0200
commit67e3b2d5a0092d41df629e950a38a80743717d81 (patch)
treed545a33ff9cc9109ed79adcc6b3e5ef13c569095 /same/src/main/java/com/orbekk/same/SameController.java
parente2d00cd5fa29e1a5cada502248cd81358e4da491 (diff)
Master→Client communication uses protobuf services.
– This change causes inconsistency in the .participants list and as a result some Paxos related tests run infinitely.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r--same/src/main/java/com/orbekk/same/SameController.java2
1 files changed, 0 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 b87e6f5..8aeebd6 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -42,12 +42,10 @@ public class SameController {
master.resumeFrom(lastKnownState, masterId);
pServer.registerService(master.getNewService());
master.start();
- masterService.setService(master.getService());
}
@Override
public void disableMaster() {
- masterService.setService(null);
if (master != null) {
master.interrupt();
}