fix(DevSupport): Prevent WebSocket JS Executor from hanging on reload (microsoft#423)

rozele · rozele · commit 2d606dfd796f · 2016-05-18T09:38:20.000-04:00
The WebSocket JS executor was being disconnected before before it was disposed because a new executor would replace it before the dispose operation. Ensuring the new connection only occurs after the previous connection has been disposed. Fixes microsoft#374
diff --git a/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs b/ReactWindows/ReactNative/DevSupport/DevSupportManager.cs
@@ -382,9 +382,13 @@ private async Task ReloadJavaScriptInProxyMode(Action dismissProgress, Cancellat
             try
             {
                 await _devServerHelper.LaunchDevToolsAsync(token);
-                var executor = new WebSocketJavaScriptExecutor();
-                await executor.ConnectAsync(_devServerHelper.WebsocketProxyUrl, token);
-                var factory = new Func<IJavaScriptExecutor>(() => executor);
+                var factory = new Func<IJavaScriptExecutor>(() =>
+                {
+                    var executor = new WebSocketJavaScriptExecutor();
+                    executor.ConnectAsync(_devServerHelper.WebsocketProxyUrl, token).Wait();
+                    return executor;
+                });
+
                 _reactInstanceCommandsHandler.OnReloadWithJavaScriptDebugger(factory);
                 dismissProgress();
             }
