From 8810554ce9db48fadcf73270dba4aa597b29d3c8 Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Thu, 28 Sep 2017 15:16:37 +1300 Subject: [PATCH] Fixed bug where server wasn't being unregistered from discovery server - Added missing unregister() method call Tags: #story[1281] --- .../java/seng302/discoveryServer/DiscoveryServerClient.java | 2 +- src/main/java/seng302/discoveryServer/util/ServerListing.java | 2 +- src/main/java/seng302/gameServer/ServerAdvertiser.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/discoveryServer/DiscoveryServerClient.java b/src/main/java/seng302/discoveryServer/DiscoveryServerClient.java index 80521951..4454d25c 100644 --- a/src/main/java/seng302/discoveryServer/DiscoveryServerClient.java +++ b/src/main/java/seng302/discoveryServer/DiscoveryServerClient.java @@ -19,7 +19,7 @@ import java.util.Timer; import java.util.TimerTask; public class DiscoveryServerClient { - private final Integer UPDATE_INTERVAL_MS = 1000; + private final Integer UPDATE_INTERVAL_MS = 700; private static String roomCode = null; private Timer serverListingUpdateTimer; diff --git a/src/main/java/seng302/discoveryServer/util/ServerListing.java b/src/main/java/seng302/discoveryServer/util/ServerListing.java index d477b717..31e7a387 100644 --- a/src/main/java/seng302/discoveryServer/util/ServerListing.java +++ b/src/main/java/seng302/discoveryServer/util/ServerListing.java @@ -1,7 +1,7 @@ package seng302.discoveryServer.util; public class ServerListing { - public final static int SERVER_TTL_DEFAULT = 3; + public final static int SERVER_TTL_DEFAULT = 5; private String serverName = ""; private String mapName = ""; diff --git a/src/main/java/seng302/gameServer/ServerAdvertiser.java b/src/main/java/seng302/gameServer/ServerAdvertiser.java index d0868734..2b363601 100644 --- a/src/main/java/seng302/gameServer/ServerAdvertiser.java +++ b/src/main/java/seng302/gameServer/ServerAdvertiser.java @@ -146,6 +146,8 @@ public class ServerAdvertiser { public void unregister(){ if (serviceInfo != null) jmdnsInstance.unregisterService(serviceInfo); + + repositoryClient.unregister(); } /**