From 52ad0bdcd80b01ab6b40ddc0fca8c1e3ab9d0a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Wed, 18 Jan 2012 10:53:03 +0100
Subject: Remove clients upon errors.

Add test for removing clients.
---
 same/src/main/java/com/orbekk/same/MasterServiceImpl.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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

diff --git a/same/src/main/java/com/orbekk/same/MasterServiceImpl.java b/same/src/main/java/com/orbekk/same/MasterServiceImpl.java
index f8044e4..ced0dba 100644
--- a/same/src/main/java/com/orbekk/same/MasterServiceImpl.java
+++ b/same/src/main/java/com/orbekk/same/MasterServiceImpl.java
@@ -68,7 +68,14 @@ public class MasterServiceImpl implements MasterService, UrlReceiver, Runnable {
     }
     
     private synchronized void removeParticipant(String url) {
-        logger.error("Remove participant {}: Operation not supported", url);
+        List<String> participants = participants();
+        if (participants.contains(url)) {
+            logger.warn("RemoveParticipant({})", url);
+            participants.remove(url);
+            state.updateFromObject(".participants", participants,
+                    state.getRevision(".participants") + 1);
+            notifyAll();
+        }
     }
     
     private void broadcastNewComponents(List<String> destinations,
@@ -82,7 +89,7 @@ public class MasterServiceImpl implements MasterService, UrlReceiver, Runnable {
                                  c.getRevision());
                      }
                  } catch (Exception e) {
-                     logger.warn("Client {} failed to receive state update.");
+                     logger.info("Client {} failed to receive state update.", url);
                      removeParticipant(url);
                  }
             }
-- 
cgit v1.2.3