MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Relax registration checks for same servers somewhat.

Browse Source 
If a server with the same ServerInfo is attempting to be re-registered,
we will return the existing registered server, which is less surprising
behavior than before.
This commit is contained in:
Andrew Steinborn
2018-10-21 20:03:38 -04:00
parent 3bd48dec99
commit f6cac0f50a
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/src/main/java/com/velocitypowered/proxy/server/ServerMap.java
View File

@@ -34,8 +34,15 @@ public class ServerMap {
Preconditions.checkNotNull(serverInfo, "serverInfo");
String lowerName = serverInfo.getName().toLowerCase(Locale.US);
VelocityRegisteredServer rs = new VelocityRegisteredServer(server, serverInfo);
Preconditions.checkArgument(servers.putIfAbsent(lowerName, rs) == null, "Server with name %s already registered", serverInfo.getName());
return rs;
RegisteredServer existing = servers.putIfAbsent(lowerName, rs);
if (existing != null && !existing.getServerInfo().equals(serverInfo)) {
throw new IllegalArgumentException("Server with name " + serverInfo.getName() + " already registered");
} else if (existing == null) {
return rs;
} else {
return existing;
}
}
public void unregister(ServerInfo serverInfo) {