summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/same/App.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:34:54 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-03-20 15:34:54 +0100
commitf0ec603696bcec885f74bf5a8ce69d2ea07776f1 (patch)
treed05dc46ca0398dde8ba2285616d054863898dee6 /same/src/main/java/com/orbekk/same/App.java
parente622d72a9d1cf7dbf5e2eaf5290aef073233c545 (diff)
Various fixes related to takeover.
Diffstat (limited to 'same/src/main/java/com/orbekk/same/App.java')
-rw-r--r--same/src/main/java/com/orbekk/same/App.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/same/src/main/java/com/orbekk/same/App.java b/same/src/main/java/com/orbekk/same/App.java
index b084db2..464668d 100644
--- a/same/src/main/java/com/orbekk/same/App.java
+++ b/same/src/main/java/com/orbekk/same/App.java
@@ -14,8 +14,11 @@ public class App {
try {
controller.start();
controller.searchNetworks();
- controller.createNetwork(configuration.get("networkName"));
- controller.joinNetwork(configuration.get("masterUrl"));
+ if ("true".equals(configuration.get("isMaster"))) {
+ controller.createNetwork(configuration.get("networkName"));
+ } else {
+ controller.joinNetwork(configuration.get("masterUrl"));
+ }
controller.join();
} catch (Exception e) {
logger.error("Error in App.", e);