diff options
author | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-16 19:50:36 +0100 |
---|---|---|
committer | Kjetil Ørbekk <kjetil.orbekk@gmail.com> | 2012-02-16 19:50:36 +0100 |
commit | 40cab510c223512a4f947414ae13659a7bcd607b (patch) | |
tree | f90f0b07fba6bd8d410e6ff7f2b7669dcbc8eb84 /same/src/main/java/com/orbekk/same/SameController.java | |
parent | 25d3d6d1ff6f57ad354f03a0b6cc4f1a897bb342 (diff) |
Replace Master with new implementation.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r-- | same/src/main/java/com/orbekk/same/SameController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index 7f7a5d0..8cc37fe 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -60,7 +60,7 @@ public class SameController { ServerContainer server = new ServerBuilder(port) .withServlet(new StateServlet(client.getInterface()), "/_/state") .withService(client.getService(), ClientService.class) - .withService(master, MasterService.class) + .withService(master.getService(), MasterService.class) .withService(paxos, PaxosService.class) .build(); @@ -116,12 +116,12 @@ public class SameController { public void join() { try { server.join(); - master.join(); + client.interrupt(); + master.interrupt(); if (discoveryService != null) { discoveryService.join(); } } catch (InterruptedException e) { - master.interrupt(); try { server.stop(); } catch (Exception e1) { |