Fix GS4 query reloading logic

Closes #915. This isn't a fatal error, but it's a clear papercut.
This commit is contained in:
Andrew Steinborn
2023-01-01 13:07:31 -05:00
parent f62768be9a
commit ffa4c95435

View File

@@ -448,13 +448,14 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
this.cm.close(configuration.getBind());
}
if (configuration.isQueryEnabled() && (!newConfiguration.isQueryEnabled()
|| newConfiguration.getQueryPort() != configuration.getQueryPort())) {
boolean queryPortChanged = newConfiguration.getQueryPort() != configuration.getQueryPort();
boolean queryAlreadyEnabled = configuration.isQueryEnabled();
boolean queryEnabled = newConfiguration.isQueryEnabled();
if ((!queryEnabled && queryAlreadyEnabled) || queryPortChanged) {
this.cm.close(new InetSocketAddress(
configuration.getBind().getHostString(), configuration.getQueryPort()));
}
if (newConfiguration.isQueryEnabled()) {
if (queryEnabled && queryPortChanged) {
this.cm.queryBind(newConfiguration.getBind().getHostString(),
newConfiguration.getQueryPort());
}