From fa6add7d4bc68467862385f153915e4b4b713f83 Mon Sep 17 00:00:00 2001 From: Will Holen Date: Thu, 5 Sep 2019 16:26:11 -0700 Subject: [PATCH] Page reloads through execution context Summary: This ressurects D14994945 and fixes the following extra issues: 1. Source map not being accounted for after reloads 2. Breakpoints being resent before Hermes is ready for them 3. Connection being dropped when reloading at inopportune times This hopefully fixes the issue of having to close and re-open the debugger if it's attached when reloading. Reviewed By: sahrens Differential Revision: D17100911 fbshipit-source-id: df988e7bb532170f5add47b9e49cd7c8ddf67b43 --- .../react/devsupport/InspectorPackagerConnection.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java index 228b4177239..a6027174927 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java @@ -138,7 +138,9 @@ public class InspectorPackagerConnection { String wrappedEvent = payload.getString("wrappedEvent"); Inspector.LocalConnection inspectorConnection = mInspectorConnections.get(pageId); if (inspectorConnection == null) { - throw new IllegalStateException("Not connected: " + pageId); + // This tends to happen during reloads, so don't panic. + FLog.w(TAG, "PageID " + pageId + " is disconnected. Dropping event: " + wrappedEvent); + return; } inspectorConnection.sendMessage(wrappedEvent); }