Fix issues when transfering to new master.

.masterUrl needs to be set explicitly.
Some other fixes.

1 files changed, 6 insertions, 1 deletions

diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 1a9fb7f..1927731 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -195,11 +195,16 @@ public class Client implements DiscoveryListener {
         this.masterController = masterController;
     }
     
+    private void reset() {
+        state.clear();
+        masterId = 0;
+    }
+    
     public void joinNetwork(String masterUrl) {
         logger.info("joinNetwork({})", masterUrl);
         connectionState = ConnectionState.UNSTABLE;
         MasterService master = connections.getMaster(masterUrl);
-        state.clear();
+        reset();
         try {
             master.joinNetworkRequest(myUrl);
         } catch (Exception e) {