100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
AbstractNettyIoClient and WebsocketClient minor connection improvements
Rich Turnere8929c3901e3
diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.javaindex 6f78edc55..91601826b 100644--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java@@ -132,6 +132,11 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen@Overridepublic synchronized void connect() {+ if (permanentError) {+ LOG.fine("Unable to connect as permanent error has been set");+ return;+ }+if (connectionStatus != ConnectionStatus.DISCONNECTED && connectionStatus != ConnectionStatus.WAITING) {LOG.finest("Must be disconnected before calling connect: " + getSocketAddressString());return;diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.javaindex a1783c7dd..a46a4d1f5 100644--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java@@ -162,11 +162,12 @@ public class WebsocketClient extends AbstractNettyIoClient<String, InetSocketAddport = uri.getPort();}- if (!"ws".equalsIgnoreCase(scheme) && !"wss".equalsIgnoreCase(scheme)) {- LOG.warning("Only WS(S) is supported: " + getSocketAddressString());- setPermanentError("Only WS(S) is supported");- return;- }+ // Our own manager uses HTTP(S) and upgrades to WS(S) so this is not appropriate+// if (!"ws".equalsIgnoreCase(scheme) && !"wss".equalsIgnoreCase(scheme)) {+// LOG.warning("Only WS(S) is supported: " + getSocketAddressString());+// setPermanentError("Only WS(S) is supported");+// return;+// }useSsl = "wss".equalsIgnoreCase(scheme);}@@ -262,6 +263,12 @@ public class WebsocketClient extends AbstractNettyIoClient<String, InetSocketAdd@Overridepublic synchronized void connect() {++ if (permanentError) {+ LOG.fine("Unable to connect as permanent error has been set");+ return;+ }+if (oAuthGrant != null) {LOG.fine("Retrieving OAuth access token: " + getSocketAddressString());