Releasing event loop when connection failed and not reconnecting

hivemq · Feb 5, 2020 · b64bee6 · b64bee6
1 parent a2a6c4c
commit b64bee6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java
@@ -115,6 +115,5 @@ public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final @Not
         ctx.close();
         MqttConnAckSingle.reconnect(clientConfig, MqttDisconnectSource.CLIENT, new ConnectionFailedException(cause),
                 connect, connAckFlow, ctx.channel().eventLoop());
-        clientConfig.releaseEventLoop();
     }
 }
diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java
@@ -139,7 +139,6 @@ private static void reconnect(
 
         if (reconnector.isReconnect()) {
             clientConfig.getRawState().set(DISCONNECTED_RECONNECT);
-            clientConfig.acquireEventLoop();
             eventLoop.schedule(() -> {
                 reconnector.getFuture().whenComplete((ignored, throwable) -> {
                     if (reconnector.isReconnect()) {
@@ -163,6 +162,7 @@ private static void reconnect(
             }, reconnector.getDelay(TimeUnit.NANOSECONDS), TimeUnit.NANOSECONDS);
         } else {
             clientConfig.getRawState().set(DISCONNECTED);
+            clientConfig.releaseEventLoop();
             if (flow != null) {
                 flow.onError(cause);
             }

diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java
@@ -239,12 +239,6 @@ private void reconnect(
                 connectionConfig.getTransportConfig(), eventLoop);
     }
 
-    @Override
-    public void channelUnregistered(final @NotNull ChannelHandlerContext ctx) {
-        ctx.fireChannelUnregistered();
-        clientConfig.releaseEventLoop();
-    }
-
     @Override
     public boolean isSharable() {
         return false;