From 2595e02a1b0304b82a5e7e2fe1f1dce0f7c69105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 31 Jan 2012 14:13:57 +0100 Subject: Use full url with discovery. --- same/src/main/java/com/orbekk/same/ClientServiceImpl.java | 5 ++--- same/src/test/java/com/orbekk/same/ClientServiceImplTest.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'same') diff --git a/same/src/main/java/com/orbekk/same/ClientServiceImpl.java b/same/src/main/java/com/orbekk/same/ClientServiceImpl.java index 658bf37..3ba8b04 100644 --- a/same/src/main/java/com/orbekk/same/ClientServiceImpl.java +++ b/same/src/main/java/com/orbekk/same/ClientServiceImpl.java @@ -149,14 +149,13 @@ public class ClientServiceImpl implements UrlReceiver, @Override public void discover(String url) { - String clientUrl = url + "ClientService.json"; if (!url.equals(myUrl)) { try { - connections.getClient(clientUrl) + connections.getClient(url) .notifyNetwork(state.getDataOf(".networkName"), state.getDataOf(".masterUrl")); } catch (Exception e) { - logger.warn("Failed to contact new client {}: {}", clientUrl, + logger.warn("Failed to contact new client {}: {}", url, throwableToString(e)); } } diff --git a/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java b/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java index 5f04485..2cae247 100644 --- a/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java +++ b/same/src/test/java/com/orbekk/same/ClientServiceImplTest.java @@ -31,7 +31,7 @@ public class ClientServiceImplTest { ClientService mockClient = mock(ClientService.class); connections.clientMap.put("mockClient/ClientService.json", mockClient); - client.discover("mockClient/"); + client.discover("mockClient/ClientService.json"); verify(mockClient).notifyNetwork("ClientNetwork", "master"); } } -- cgit v1.2.3