Fix reconnect issues

sportradar · Jul 1, 2024 · 1b36cf5 · 1b36cf5
1 parent c8171fd
commit 1b36cf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/sdk/src/main/java/com/sportradar/mbs/sdk/internal/connection/WebSocketConnection.java b/src/sdk/src/main/java/com/sportradar/mbs/sdk/internal/connection/WebSocketConnection.java
@@ -88,7 +88,7 @@ private void sendLoop() {
                 try {
                     sendMsg(ws, msgs);
                 } catch (final Exception e) {
-                    this.receiveQueue.add(new ExcWsOutputMessage(msg, new WebSocketConnectionException(e)));
+                    this.receiveQueue.add(new ExcWsOutputMessage(null, new WebSocketConnectionException(e)));
                     reconnectWebSocket(ws, false);
                     sendMsg(this.webSocket.get(), msgs);
                 }

diff --git a/src/sdk/src/main/java/com/sportradar/mbs/sdk/internal/protocol/ProtocolEngine.java b/src/sdk/src/main/java/com/sportradar/mbs/sdk/internal/protocol/ProtocolEngine.java
@@ -124,6 +124,10 @@ private <R extends ContentResponse> void enqueueSendMsg(final Awaiter<R> awaiter
             releaseAwaiter(awaiter.getCorrelationId());
             return;
         }
+        if (awaiter.getFuture().isDone()) {
+            releaseAwaiter(awaiter.getCorrelationId());
+            return;
+        }
 
         sendQueue.add(awaiter.getSendWsInputMessage());
 
@@ -253,6 +257,9 @@ private void handleExcWsOutputMessage(final ExcWsOutputMessage msg) {
     }
 
     private boolean responseReceived(final String correlationId, final Response response) {
+        if (correlationId == null) {
+            return false;
+        }
         final Awaiter<?> awaiter = correlationIdAwaiter.get(correlationId);
         if (response.getContent() != null
                 && awaiter != null
@@ -265,6 +272,9 @@ private boolean responseReceived(final String correlationId, final Response resp
     }
 
     private boolean responseReceived(final String correlationId, final SdkException sdkException) {
+        if (correlationId == null) {
+            return false;
+        }
         final Awaiter<?> awaiter = correlationIdAwaiter.get(correlationId);
         if (awaiter != null) {
             awaiter.completeWithException(sdkException);