From 255f2f3622057ed755ebb085607c6eea977713f1 Mon Sep 17 00:00:00 2001 From: Philip Khaisman Date: Fri, 19 Jun 2026 14:50:00 -0400 Subject: [PATCH 1/3] Fix infinite look when connecting over TCP with TLS enabled --- .vscode/settings.json | 3 +++ .../java/org/sensorhub/impl/comm/TCPCommProvider.java | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..7b016a89fb --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java index 7526e124fa..846918901a 100644 --- a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java +++ b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java @@ -82,17 +82,15 @@ protected void doStart() throws SensorHubException SSLSocketFactory factory = (SSLSocketFactory) SSLSocketFactory.getDefault(); socket = factory.createSocket(addr, config.remotePort); ((SSLSocket) socket).startHandshake(); - is = socket.getInputStream(); - os = socket.getOutputStream(); } else { SocketAddress endpoint = new InetSocketAddress(addr, config.remotePort); socket = new Socket(); socket.connect(endpoint, this.config.connection.connectTimeout); - is = socket.getInputStream(); - os = socket.getOutputStream(); -// isRetrying = false; - break; } + + is = socket.getInputStream(); + os = socket.getOutputStream(); + break; } catch (IOException e) { if(++count >= retryAttempts) throw new SensorHubException("Cannot connect to remote host " From 42e144f3e76f21c21c14336ff2fc3d14feaa86aa Mon Sep 17 00:00:00 2001 From: Philip Khaisman Date: Fri, 19 Jun 2026 14:51:57 -0400 Subject: [PATCH 2/3] Remove .vscode file from changes --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7b016a89fb..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.compile.nullAnalysis.mode": "automatic" -} \ No newline at end of file From e88976be34e355aa851442849aacbf1c2697bd30 Mon Sep 17 00:00:00 2001 From: Philip Khaisman Date: Fri, 19 Jun 2026 14:54:40 -0400 Subject: [PATCH 3/3] Remove comment --- .../src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java index 846918901a..d902d77229 100644 --- a/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java +++ b/sensorhub-core/src/main/java/org/sensorhub/impl/comm/TCPCommProvider.java @@ -73,7 +73,7 @@ protected void doStart() throws SensorHubException int count = 0; int retryAttempts = this.config.connection.reconnectAttempts; -// boolean isRetrying = retryAttempts >= 0; + while(true) { try { InetAddress addr = InetAddress.getByName(config.remoteHost);