From 4e8da9b28f58385d7f4e6d85fe7544edf43c5d6b Mon Sep 17 00:00:00 2001 From: Amy Nichol Date: Fri, 24 Sep 2021 09:42:58 -0700 Subject: [PATCH] Back out "Fix - ReconnectingWebSocket race condition mClosed" Summary: Changelog:[Internal] Original commit changeset: 48793bd3bea9 Reviewed By: ShikaSD Differential Revision: D31170947 fbshipit-source-id: cb460e3261fdc2a0df6e3a4597c61bd879ecf38f --- .../ReconnectingWebSocket.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java index 527bc812075..69a417078f9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java +++ b/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java @@ -66,10 +66,8 @@ public final class ReconnectingWebSocket extends WebSocketListener { } public void connect() { - synchronized (this) { - if (mClosed) { - throw new IllegalStateException("Can't connect closed client"); - } + if (mClosed) { + throw new IllegalStateException("Can't connect closed client"); } Request request = new Request.Builder().url(mUrl).build(); @@ -84,10 +82,8 @@ public final class ReconnectingWebSocket extends WebSocketListener { } private void reconnect() { - synchronized (this) { - if (mClosed) { - throw new IllegalStateException("Can't reconnect closed client"); - } + if (mClosed) { + throw new IllegalStateException("Can't reconnect closed client"); } if (!mSuppressConnectionErrors) { @@ -106,10 +102,8 @@ public final class ReconnectingWebSocket extends WebSocketListener { } public void closeQuietly() { - synchronized (this) { - mClosed = true; - closeWebSocketQuietly(); - } + mClosed = true; + closeWebSocketQuietly(); mMessageCallback = null; if (mConnectionCallback != null) {