fix: Made sure the KNX driver emits the DisconnectedEvent

apache · Aug 13, 2024 · 77dfb25 · 77dfb25
1 parent 36fdd4e
commit 77dfb25
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/...knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java b/...knxnetip/src/main/java/org/apache/plc4x/java/knxnetip/protocol/KnxNetIpProtocolLogic.java
@@ -227,24 +227,23 @@ public void onDisconnect(ConversationContext<KnxNetIpMessage> context) {
         // Cancel the timer for sending connection state requests.
         connectionStateTimer.cancel();
 
+        // Just send out the disconnect request message, in most cases the remote will not respond.
+        // So in this case we'll just fire out the message and treat the connection as closed.
         DisconnectRequest disconnectRequest = new DisconnectRequest(knxNetIpDriverContext.getCommunicationChannelId(),
             new HPAIControlEndpoint(HostProtocolCode.IPV4_UDP,
                 knxNetIpDriverContext.getLocalIPAddress(), knxNetIpDriverContext.getLocalPort()));
-        context.sendRequest(disconnectRequest)
-            .expectResponse(KnxNetIpMessage.class, Duration.ofMillis(1000))
-            .only(DisconnectResponse.class)
-            .handle(disconnectResponse -> {
-                // In general, we should probably check if the disconnect was successful, but in
-                // the end we couldn't do much if the disconnect would fail.
-                final String gatewayName = knxNetIpDriverContext.getGatewayName();
-                final KnxAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
-                LOGGER.info(String.format("Disconnected from KNX Gateway '%s' with KNX address '%d.%d.%d'", gatewayName,
-                    gatewayAddress.getMainGroup(), gatewayAddress.getMiddleGroup(), gatewayAddress.getSubGroup()));
-
-                // Send an event that connection disconnect is complete.
-                context.fireDisconnected();
-                LOGGER.debug("Disconnected event fired from KNX protocol");
-            });
+        context.sendToWire(disconnectRequest);
+
+        // In general, we should probably check if the disconnect was successful, but in
+        // the end we couldn't do much if the disconnect would fail.
+        final String gatewayName = knxNetIpDriverContext.getGatewayName();
+        final KnxAddress gatewayAddress = knxNetIpDriverContext.getGatewayAddress();
+        LOGGER.info("Disconnected from KNX Gateway '{}' with KNX address '{}.{}.{}'",
+            gatewayName, gatewayAddress.getMainGroup(), gatewayAddress.getMiddleGroup(), gatewayAddress.getSubGroup());
+
+        // Send an event that connection disconnect is complete.
+        context.fireDisconnected();
+        LOGGER.debug("Disconnected event fired from KNX protocol");
     }
 
     @Override