Fix "initialConnectRetryEnabled" config suppressing "reconnectEnabled".

Signed-off-by: Yufei Cai <[email protected]> (cherry picked from commit 42b12e0)
eclipse-ditto · Dec 22, 2020 · ece2426 · ece2426
1 parent 55d5ca2
commit ece2426
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 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
@@ -184,7 +184,8 @@ public CompletionStage<?> initializeAsync() {
         // this method may be called multiple times.
         if (!initializing.getAndSet(true)) {
             if (webSocket.get() == null) {
-                return connectWithPotentialRetries(this::createWebsocket, initializationFuture)
+                return connectWithPotentialRetries(this::createWebsocket, initializationFuture,
+                        messagingConfiguration.isInitialConnectRetryEnabled())
                         .thenApply(ws -> {
                             setWebSocket(ws);
                             return this;
@@ -335,12 +336,12 @@ public void onError(final WebSocket websocket, final WebSocketException cause) {
     }
 
     private CompletableFuture<WebSocket> connectWithPotentialRetries(final Supplier<WebSocket> webSocket,
-            final CompletableFuture<WebSocket> future) {
+            final CompletableFuture<WebSocket> future,
+            final boolean retry) {
 
         try {
-            final Predicate<Throwable> isRecoverable = messagingConfiguration.isInitialConnectRetryEnabled()
-                    ? WebSocketMessagingProvider::isRecoverable
-                    : exception -> false;
+            final Predicate<Throwable> isRecoverable =
+                    retry ? WebSocketMessagingProvider::isRecoverable : exception -> false;
             return Retry.retryTo("initialize WebSocket connection",
                     () -> initiateConnection(webSocket.get()))
                     .inClientSession(sessionId)
@@ -372,7 +373,8 @@ private void handleReconnectionIfEnabled() {
     }
 
     private void reconnectWithRetries() {
-        this.connectWithPotentialRetries(this::recreateWebSocket, new CompletableFuture<>())
+        this.connectWithPotentialRetries(this::recreateWebSocket, new CompletableFuture<>(),
+                messagingConfiguration.isReconnectEnabled())
                 .thenAccept(reconnectedWebSocket -> {
                     setWebSocket(reconnectedWebSocket);
                     reconnecting.set(false);

diff --git a/...test/java/org/eclipse/ditto/client/messaging/internal/WebSocketMessagingProviderTest.java b/...test/java/org/eclipse/ditto/client/messaging/internal/WebSocketMessagingProviderTest.java
@@ -81,7 +81,7 @@ public void connectToUnknownHostWithErrorConsumer() throws Exception {
         expectNoMsg(errors);
     }
 
-    @Ignore
+    @Ignore("TODO: fix it")
     @Test(timeout = 10_000)
     public void serviceUnavailable() throws Exception {
         final int numberOfRecoverableErrors = 3;