review: renamed atomicboolean + reset it to "false" when connection w…

…as (re-)established Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Jun 10, 2021 · cb788d2 · cb788d2
1 parent 3062cf0
commit cb788d2
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...src/main/java/org/eclipse/ditto/client/messaging/internal/WebSocketMessagingProvider.java b/...src/main/java/org/eclipse/ditto/client/messaging/internal/WebSocketMessagingProvider.java
@@ -35,6 +35,9 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
+import org.eclipse.ditto.base.model.common.HttpStatus;
+import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.eclipse.ditto.client.configuration.AuthenticationConfiguration;
 import org.eclipse.ditto.client.configuration.MessagingConfiguration;
 import org.eclipse.ditto.client.internal.DefaultThreadFactory;
@@ -47,9 +50,6 @@
 import org.eclipse.ditto.client.messaging.MessagingProvider;
 import org.eclipse.ditto.json.JsonCollectors;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.acks.AcknowledgementLabel;
-import org.eclipse.ditto.base.model.common.HttpStatus;
-import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,7 +86,7 @@ public final class WebSocketMessagingProvider extends WebSocketAdapter implement
     private final Map<Object, String> subscriptionMessages;
     private final AtomicBoolean reconnecting = new AtomicBoolean(false);
     private final AtomicBoolean initializing = new AtomicBoolean(false);
-    private final AtomicBoolean websocketClosed = new AtomicBoolean(false);
+    private final AtomicBoolean explicitlyClosing = new AtomicBoolean(false);
     private final CompletableFuture<WebSocket> initializationFuture = new CompletableFuture<>();
 
     private final AtomicReference<WebSocket> webSocket;
@@ -271,7 +271,7 @@ public void close() {
             connectExecutor.shutdownNow();
             authenticationProvider.destroy();
             adaptableBus.shutdownExecutor();
-            websocketClosed.getAndSet(true);
+            explicitlyClosing.set(true);
             final WebSocket ws = webSocket.get();
             if (ws != null) {
                 ws.disconnect();
@@ -312,7 +312,7 @@ public void onDisconnected(final WebSocket websocket, final WebSocketFrame serve
                         serverCloseFrame.getCloseCode(),
                         serverCloseFrame.getCloseReason());
                 handleReconnectionIfEnabled();
-            } else if (!websocketClosed.get()) {
+            } else if (!explicitlyClosing.get()) {
                 // client closed connection because of a connection interruption or something similar
                 LOGGER.info("Client <{}>: WebSocket connection to endpoint <{}> was unintentionally closed by client " +
                                 "- client will try to reconnect if enabled!",
@@ -389,6 +389,7 @@ private void reconnectWithRetries() {
     }
 
     private void setWebSocket(final WebSocket webSocket) {
+        explicitlyClosing.set(false); // reset potential explicit close request by the user
         synchronized (this.webSocket) {
             final WebSocket oldWebSocket = this.webSocket.get();
             this.webSocket.set(webSocket);