This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push: new be8d9c0 [SYNCOPE-1612] fix connector/resource connection check (#308) be8d9c0 is described below commit be8d9c004a145bd5c7bcb1d72f272bc2c185729a Author: Fabio Martelli <fabio.marte...@tirasa.net> AuthorDate: Fri Feb 4 15:47:57 2022 +0100 [SYNCOPE-1612] fix connector/resource connection check (#308) --- .../client/console/topology/TopologyWebSocketBehavior.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java index 5a40dc9..4af5b24 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java @@ -59,12 +59,12 @@ public class TopologyWebSocketBehavior extends WebSocketBehavior { final Map<String, String> responses, final Set<String> running) { - String response; + String response = null; try { - if (timeout == null || timeout <= 0) { + if (timeout == null || timeout < 0) { LOG.debug("No timeouts for resource connection checking ... "); response = checker.call(); - } else { + } else if (timeout > 0) { LOG.debug("Timeouts provided for resource connection checking ... "); response = SyncopeConsoleSession.get().execute(checker).get(timeout, TimeUnit.SECONDS); } @@ -78,7 +78,9 @@ public class TopologyWebSocketBehavior extends WebSocketBehavior { TopologyNode.Status.FAILURE, checker.key); } - responses.put(checker.key, response); + if (response != null) { + responses.put(checker.key, response); + } running.remove(checker.key); }