MarimerLLC#1059 Implement sync code in HttpProxy that works from Wind…

…ows Forms
rockfordlhotka · Apr 3, 2019 · 33affd0 · 33affd0
1 parent f2ad736
commit 33affd0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Source/Csla.Shared/DataPortalClient/HttpProxy.cs b/Source/Csla.Shared/DataPortalClient/HttpProxy.cs
@@ -412,13 +412,14 @@ public async Task<DataPortalResult> Delete(Type objectType, object criteria, Dat
 
     private async Task<byte[]> CallDataPortalServer(HttpClient client, byte[] serialized, string operation, string routingToken, bool isSync)
     {
-      var task = CallDataPortalServer(client, serialized, operation, routingToken);
+      //var task = CallDataPortalServer(client, serialized, operation, routingToken);
 #if !NET40
       if (isSync)
-        serialized = task.RunWithContext(_client.Timeout);
+        Task.Run(async () => 
+        serialized = await CallDataPortalServer(client, serialized, operation, routingToken)).Wait();
       else
 #endif
-      serialized = await task;
+        serialized = await CallDataPortalServer(client, serialized, operation, routingToken);
       return serialized;
     }