Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop

* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
  Fix ServerMonitor not actually removing ServerGroup instances.
This commit is contained in:
Shaun Bennett 2016-01-20 12:24:33 -06:00
commit 7715df8e6a

View File

@ -206,7 +206,7 @@ public class ServerMonitor
if (groupStatus.getServerType().equalsIgnoreCase("Player")) if (groupStatus.getServerType().equalsIgnoreCase("Player"))
{ {
_repository.removeServerGroup(groupStatus); _repository.removeServerGroup(groupStatus);
_serverGroupMap.remove(groupStatus); _serverGroupMap.remove(groupStatus.getName());
groupStatusIterator.remove(); groupStatusIterator.remove();
System.out.println("Removed MPS : " + groupStatus.getName()); System.out.println("Removed MPS : " + groupStatus.getName());
@ -449,7 +449,7 @@ public class ServerMonitor
if (serverGroup != null && serverGroup.getHost() != null && !serverGroup.getHost().isEmpty() && serverGroup.getServerCount() <= 1) if (serverGroup != null && serverGroup.getHost() != null && !serverGroup.getHost().isEmpty() && serverGroup.getServerCount() <= 1)
{ {
_repository.removeServerGroup(serverGroup); _repository.removeServerGroup(serverGroup);
_serverGroupMap.remove(serverGroup); _serverGroupMap.remove(serverGroup.getName());
_serverGroups.remove(serverGroup); _serverGroups.remove(serverGroup);
System.out.println("Removed ServerGroup : " + serverGroup.getName()); System.out.println("Removed ServerGroup : " + serverGroup.getName());
} }