From cd660183bad3757d12beb9c1e9c1afa1d0e03419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 27 Mar 2012 11:42:42 +0200 Subject: Fix state bug. Make sure to copy the state when creating a new master. Using the same state instance on the master and client is a disaster. --- same/src/main/java/com/orbekk/same/Client.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'same/src/main/java/com/orbekk/same/Client.java') diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java index b210b6b..53d0ac8 100644 --- a/same/src/main/java/com/orbekk/same/Client.java +++ b/same/src/main/java/com/orbekk/same/Client.java @@ -103,7 +103,8 @@ public class Client { listener.stateChanged(state.getComponent(component)); } } else { - logger.warn("Ignoring update: {}", + logger.warn("Ignoring update: {) => {}", + state.getComponent(component), new State.Component(component, revision, data)); } } @@ -261,7 +262,7 @@ public class Client { } catch (CancellationException e) { } if (!currentMasterProposal.isCancelled() && result != null) { - masterController.enableMaster(state, result); + masterController.enableMaster(new State(state), result); } } -- cgit v1.2.3