diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-07 15:44:08 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-07 15:48:12 +0100 |
commit | 135ef16d40619bc7fe186b1cdfe825a39b22492d (patch) | |
tree | 8dcb159b83054733f85000a32acdc3156f679bd9 /config-proxy | |
parent | fc750918ecc48d270d58df0421ea49a5e55f2398 (diff) |
Simplify
Diffstat (limited to 'config-proxy')
-rw-r--r-- | config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java index dd1f0d36abd..d352637a835 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ClientUpdater.java @@ -60,27 +60,21 @@ class ClientUpdater { log.log(LogLevel.DEBUG, "Delayed response queue has " + responseDelayQueue.size() + " elements"); } } - DelayedResponse[] responses = new DelayedResponse[1]; - responses = responseDelayQueue.toArray(responses); + DelayedResponse[] responses = responseDelayQueue.toArray(new DelayedResponse[0]); boolean found = false; - if (responses.length > 0) { - for (DelayedResponse response : responses) { - JRTServerConfigRequest request = response.getRequest(); - if (request.getConfigKey().equals(config.getKey())) { - if (!delayedResponses.remove(response)) { - if (log.isLoggable(LogLevel.DEBUG)) { - log.log(LogLevel.DEBUG, "Could not remove " + config.getKey() + " from delayed delayedResponses queue, already removed"); - } - continue; - } + for (DelayedResponse response : responses) { + JRTServerConfigRequest request = response.getRequest(); + if (request.getConfigKey().equals(config.getKey())) { + if (delayedResponses.remove(response)) { found = true; if (log.isLoggable(LogLevel.DEBUG)) { log.log(LogLevel.DEBUG, "Call returnOkResponse for " + config.getKey() + "," + config.getGeneration()); } rpcServer.returnOkResponse(request, config); + } else { + log.log(LogLevel.ERROR, "Could not remove " + config.getKey() + " from delayed delayedResponses queue, already removed"); } } - } if (!found) { log.log(LogLevel.DEBUG, "Found no recipient for " + config.getKey() + " in delayed response queue"); |