From 81cde6158120edab04f8db3e4045eca484a65874 Mon Sep 17 00:00:00 2001
From: lucashimpens <lucas.himpens@orange.fr>
Date: Tue, 11 Feb 2025 14:35:37 +0100
Subject: [PATCH] fix: handle Sikuli not reachable with Selenium 4 (sikuli is
 now on specific container port and not anymore on selenium node port)

---
 .../service/robotextension/impl/SikuliService.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/src/main/java/org/cerberus/core/service/robotextension/impl/SikuliService.java b/source/src/main/java/org/cerberus/core/service/robotextension/impl/SikuliService.java
index bc8a503dc..3e17a515a 100644
--- a/source/src/main/java/org/cerberus/core/service/robotextension/impl/SikuliService.java
+++ b/source/src/main/java/org/cerberus/core/service/robotextension/impl/SikuliService.java
@@ -33,6 +33,7 @@
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.ConnectException;
 import java.util.UUID;
 
 import org.apache.commons.codec.binary.Base64;
@@ -45,7 +46,6 @@
 import org.apache.tika.mime.MimeTypes;
 import org.cerberus.core.crud.entity.Parameter;
 import org.cerberus.core.crud.service.IParameterService;
-import org.cerberus.core.crud.service.impl.ParameterService;
 import org.cerberus.core.engine.entity.Identifier;
 import org.cerberus.core.engine.entity.MessageEvent;
 import org.cerberus.core.engine.entity.Session;
@@ -259,7 +259,8 @@ public boolean isSikuliServerReachableOnRobot(Session session) {
             if (connection == null || connection.getResponseCode() != 200) {
                 return false;
             }
-
+        } catch (ConnectException exception) { //Handle Sikuli not reachable with Selenium 4
+            return false;
         } catch (IOException ex) {
             LOG.warn(ex);
             return false;
@@ -298,10 +299,11 @@ public boolean isSikuliServerReachableOnNode(Session session) {
             }
 
             if (connection == null || connection.getResponseCode() != 200) {
-                LOG.info("Responce code different from 200 when calling '" + urlToConnect + "'. Disable Cerberus extension features.");
+                LOG.warn("Response code different from 200 when calling '" + urlToConnect + "'");
                 return false;
             }
-
+        } catch (ConnectException exception) { //Handle Sikuli not reachable with Selenium 4
+            return false;
         } catch (IOException ex) {
             LOG.warn("Exception catch when calling '" + urlToConnect + "' " + ex, ex);
             return false;