From 5c3fa20e73f4f3ae7ab276f6f53dd8f8feb18a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Wed, 25 Apr 2012 14:53:49 +0200 Subject: Fix SameController. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit – Register network from master controller. – Make fields final. --- same/src/main/java/com/orbekk/same/SameController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java index 651303c..068ad68 100644 --- a/same/src/main/java/com/orbekk/same/SameController.java +++ b/same/src/main/java/com/orbekk/same/SameController.java @@ -13,13 +13,13 @@ import com.orbekk.protobuf.SimpleProtobufServer; import com.orbekk.same.config.Configuration; public class SameController { - private Logger logger = LoggerFactory.getLogger(getClass()); - private SimpleProtobufServer pServer; - private Master master; - private Client client; - private PaxosServiceImpl paxos; - private Configuration configuration; - private ConnectionManager connections; + private final Logger logger = LoggerFactory.getLogger(getClass()); + private final SimpleProtobufServer pServer; + private volatile Master master; + private final Client client; + private final PaxosServiceImpl paxos; + private final Configuration configuration; + private final ConnectionManager connections; private final RpcFactory rpcf; /** @@ -40,6 +40,7 @@ public class SameController { master.resumeFrom(lastKnownState, masterId); pServer.registerService(master.getNewService()); master.start(); + registerNetwork(master); } @Override -- cgit v1.2.3