From 882d749ca5a9934c8ae773d76778c1e8381e5595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 12 Mar 2012 21:01:43 +0100
Subject: Fix failing functional test.

---
 same/src/main/java/com/orbekk/same/Client.java | 2 +-
 same/src/main/java/com/orbekk/same/Master.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'same/src/main/java/com')

diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 2bfee27..4d5965b 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -21,7 +21,7 @@ public class Client implements DiscoveryListener {
     private ConnectionManager connections;
     State state;
     private String myUrl;
-    private String masterUrl;
+    String masterUrl;
     private int masterId = -1;
     
     private List<StateChangedListener> stateListeners =
diff --git a/same/src/main/java/com/orbekk/same/Master.java b/same/src/main/java/com/orbekk/same/Master.java
index ba87c12..88177d6 100644
--- a/same/src/main/java/com/orbekk/same/Master.java
+++ b/same/src/main/java/com/orbekk/same/Master.java
@@ -121,6 +121,10 @@ public class Master {
                         client.setState(c.getName(), c.getData(),
                                 c.getRevision());
                     }
+                    client.masterTakeover(
+                            state.getDataOf(".masterUrl"),
+                            state.getDataOf(".networkName"),
+                            0);
                 } catch (Exception e) {
                     logger.info("Client {} failed to receive state update.", url);
                     removeParticipant(url);
-- 
cgit v1.2.3