diff options
Diffstat (limited to 'same/src/main/java/com/orbekk/same/ClientServiceImpl.java')
| -rw-r--r-- | same/src/main/java/com/orbekk/same/ClientServiceImpl.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/same/src/main/java/com/orbekk/same/ClientServiceImpl.java b/same/src/main/java/com/orbekk/same/ClientServiceImpl.java index a870372..0854458 100644 --- a/same/src/main/java/com/orbekk/same/ClientServiceImpl.java +++ b/same/src/main/java/com/orbekk/same/ClientServiceImpl.java @@ -15,7 +15,7 @@ public class ClientServiceImpl implements DiscoveryListener { private Logger logger = LoggerFactory.getLogger(getClass()); private ConnectionManager connections; private State state; - private String myUrl = null; + private String myUrl; private StateChangedListener stateListener; private NetworkNotificationListener networkListener; @@ -57,9 +57,11 @@ public class ClientServiceImpl implements DiscoveryListener { } }; - public ClientServiceImpl(State state, ConnectionManager connections) { + public ClientServiceImpl(State state, ConnectionManager connections, + String myUrl) { this.state = state; this.connections = connections; + this.myUrl = myUrl; } public void start() { @@ -75,18 +77,13 @@ public class ClientServiceImpl implements DiscoveryListener { } public void joinNetwork(String masterUrl) { - if (myUrl != null) { - MasterService master = connections.getMaster(masterUrl); - state.clear(); - try { - master.joinNetworkRequest(myUrl); - } catch (Exception e) { - logger.error("Unable to connect to master.", e); - } - } else { - logger.error("Tried to join network at {}, but my url is unknown. " + - "Run discovery service.", masterUrl); - } + MasterService master = connections.getMaster(masterUrl); + state.clear(); + try { + master.joinNetworkRequest(myUrl); + } catch (Exception e) { + logger.error("Unable to connect to master.", e); + } } String lib_get(String name) { |