Merged Pull Request '#131 catch-non-pipeline-exceptions-also->main : …

…Replace `catch (PipelineException e)` with `catch (Exception e)`.' Replace `catch (PipelineException e)` with `catch (Exception e)`.
51Degrees · Oct 15, 2024 · 7d7b1b7 · 7d7b1b7
2 parents cd84eda + dc06bb5
commit 7d7b1b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/....Pipeline.Elements/FiftyOne.Pipeline.JsonBuilderElement/FlowElement/JsonBuilderElement.cs b/....Pipeline.Elements/FiftyOne.Pipeline.JsonBuilderElement/FlowElement/JsonBuilderElement.cs
@@ -298,7 +298,7 @@ protected virtual string BuildJson(IFlowData data, PipelineConfig config, bool r
             {
                 sequenceNumber = GetSequenceNumber(data);
             }
-            catch (PipelineException e)
+            catch (Exception e)
             {
                 if (requireSequenceNumber)
                 {

diff --git a/FiftyOne.Pipeline.Web.Shared/Services/ClientsidePropertyService.cs b/FiftyOne.Pipeline.Web.Shared/Services/ClientsidePropertyService.cs
@@ -220,7 +220,7 @@ private void ServeContent(IContextAdapter context, IFlowData flowData, ContentTy
             {
                 pipelineEvidenceKeyFilter = _pipeline.EvidenceKeyFilter;
             }
-            catch (PipelineException ex)
+            catch (Exception ex)
             {
                 _logger?.LogError(ex, $"Failed to get {nameof(_pipeline.EvidenceKeyFilter)} from {nameof(_pipeline)}");
                 hadFailures = true;
@@ -257,7 +257,7 @@ private void ServeContent(IContextAdapter context, IFlowData flowData, ContentTy
                     {
                         jsonData = flowData.GetFromElement(jsonElement);
                     }
-                    catch (PipelineException ex)
+                    catch (Exception ex)
                     {
                         _logger?.LogError(ex, "Failed to get data from {flowElementType}", jsonElement.GetType().Name);
                         jsonData = jsonElement.GetFallbackResponse(flowData);
@@ -279,7 +279,7 @@ private void ServeContent(IContextAdapter context, IFlowData flowData, ContentTy
                     {
                         jsData = flowData.GetFromElement(jsElement);
                     }
-                    catch (PipelineException ex)
+                    catch (Exception ex)
                     {
                         _logger?.LogError(ex, "Failed to get data from {flowElementType}", jsElement.GetType().Name);
                         jsData = jsElement.GetFallbackResponse(flowData, GetJsonData());

diff --git a/Web Integration/FiftyOne.Pipeline.Web.Framework/WebPipeline.cs b/Web Integration/FiftyOne.Pipeline.Web.Framework/WebPipeline.cs
@@ -242,7 +242,7 @@ public static IFlowData Process(HttpRequest request)
                 {
                     filler = new EvidenceFiller(flowData);
                 }
-                catch (PipelineException ex)
+                catch (Exception ex)
                 {
                     flowData.AddError(ex, null);
                     throw;