Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix deadlock in AbstractNettyIOClient (#2646)

Rich Turnerd4bc16240c39
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.java
index 304d87cc6..f02011e81 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
@@ -261,7 +261,7 @@ public abstract class AbstractNettyIOClient<T> implements NettyIOClient<T> {
execution.recordResult(null);
});
- future.whenComplete((result, ex) -> {
+ future.whenCompleteAsync((result, ex) -> {
if (ex != null) {
// Cleanup resources
disconnect();
@@ -273,7 +273,7 @@ public abstract class AbstractNettyIOClient<T> implements NettyIOClient<T> {
}
}
}
- });
+ }, executorService);
synchronized (this) {
if (connectionStatus == ConnectionStatus.DISCONNECTED || connectionStatus == ConnectionStatus.DISCONNECTING) {