datastore(fix): Fixes previous PR which was inadvertently creating mu…

…ltiple websockets. (#2719)
aws-amplify · Feb 19, 2024 · 14acc3b · 14acc3b
1 parent 1804551
commit 14acc3b
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionEndpoint.java b/aws-api/src/main/java/com/amplifyframework/api/aws/SubscriptionEndpoint.java
@@ -141,17 +141,17 @@ <T> void requestSubscription(
             pendingSubscriptionIds.add(subscriptionId);
             socketListener = webSocketListener;
             socket = webSocket;
-        }
 
-        // Every request waits here for the connection to be ready.
-        Connection connection = socketListener.waitForConnectionReady();
-        if (connection.hasFailure()) {
-            // If the latch didn't count all the way down
-            if (pendingSubscriptionIds.remove(subscriptionId)) {
-                // The subscription was pending, so we need to emit an error.
-                onSubscriptionError.accept(
-                    new ApiException(connection.getFailureReason(), AmplifyException.TODO_RECOVERY_SUGGESTION));
-                return;
+            // Every request waits here for the connection to be ready.
+            Connection connection = socketListener.waitForConnectionReady();
+            if (connection.hasFailure()) {
+                // If the latch didn't count all the way down
+                if (pendingSubscriptionIds.remove(subscriptionId)) {
+                    // The subscription was pending, so we need to emit an error.
+                    onSubscriptionError.accept(
+                        new ApiException(connection.getFailureReason(), AmplifyException.TODO_RECOVERY_SUGGESTION));
+                    return;
+                }
             }
         }
 
@@ -257,7 +257,7 @@ private void notifySubscriptionData(String subscriptionId, String data) throws A
         dispatcher.dispatchNextMessage(data);
     }
 
-    synchronized void releaseSubscription(String subscriptionId) throws ApiException {
+    void releaseSubscription(String subscriptionId) throws ApiException {
         // First thing we should do is remove it from the pending subscription collection so
         // the other methods can't grab a hold of the subscription.
         final Subscription<?> subscription = subscriptions.get(subscriptionId);