summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/SameController.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-14 11:01:02 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-14 11:01:02 +0100
commit93bd1063a403fedfb79e334c5dcb81565afa655d (patch)
tree5bf2f80db092ec18104f91b721ae6befa308c62a /same/src/main/java/com/orbekk/same/SameController.java
parent4de25e837653bacee4a5fd6bb8e3ce49e075805a (diff)
Network creation and discovery in Android app.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/SameController.java')
-rw-r--r--same/src/main/java/com/orbekk/same/SameController.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index d012d64..7f7a5d0 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -34,7 +34,7 @@ public class SameController {
int port = configuration.getInt("port");
ConnectionManagerImpl connections = new ConnectionManagerImpl(
timeout, timeout);
- State state = new State("Default");
+ State clientState = new State(".InvalidClientNetwork");
Broadcaster broadcaster = BroadcasterImpl.getDefaultBroadcastRunner();
String baseUrl = String.format("http://%s:%s/",
@@ -43,10 +43,10 @@ public class SameController {
String masterUrl = baseUrl + "MasterService.json";
String clientUrl = baseUrl + "ClientService.json";
- Master master = Master.create(
- connections, broadcaster, masterUrl);
+ Master master = Master.create(connections, broadcaster,
+ masterUrl, configuration.get("networkName"));
- Client client = new Client(state, connections,
+ Client client = new Client(clientState, connections,
clientUrl);
PaxosServiceImpl paxos = new PaxosServiceImpl("");