Merge pull request #454 from MarkMpn/executeas

Fixed aggregate limit exception handling
MarkMpn · Apr 19, 2024 · 87c7858 · 87c7858
2 parents 748a3d0 + 0af0563
commit 87c7858
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs
@@ -364,7 +364,15 @@ protected override IEnumerable<Entity> ExecuteInternal(NodeExecutionContext cont
                     return ((RetrieveMultipleResponse)dataSource.Execute(req)).EntityCollection;
                 });
 
-                task.Wait(context.Options.CancellationToken);
+                try
+                {
+                    task.Wait(context.Options.CancellationToken);
+                }
+                catch (AggregateException ex)
+                {
+                    throw ex.InnerException;
+                }
+
                 res = task.Result;
             }
             catch (FaultException<OrganizationServiceFault> ex)
@@ -429,7 +437,15 @@ protected override IEnumerable<Entity> ExecuteInternal(NodeExecutionContext cont
                     return ((RetrieveMultipleResponse)dataSource.Execute(req)).EntityCollection;
                 });
 
-                task.Wait(context.Options.CancellationToken);
+                try
+                {
+                    task.Wait(context.Options.CancellationToken);
+                }
+                catch (AggregateException ex)
+                {
+                    throw ex.InnerException;
+                }
+
                 var nextPage = task.Result;
 
                 PagesRetrieved++;