From 69c81cf2fc1c1151058b1cf20e474d907e2940ca Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Mon, 13 Sep 2021 14:27:31 +0200
Subject: [PATCH] EDMIAPI/DatabaseWithFallback: Handle exception in
 GetDatatable

---
 Modules.EDMIAPI/DatabaseWithFallback.vb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Modules.EDMIAPI/DatabaseWithFallback.vb b/Modules.EDMIAPI/DatabaseWithFallback.vb
index e630308a..afa45129 100644
--- a/Modules.EDMIAPI/DatabaseWithFallback.vb
+++ b/Modules.EDMIAPI/DatabaseWithFallback.vb
@@ -23,10 +23,18 @@ Public Class DatabaseWithFallback
             Dim oResult As DataTable = Nothing
 
             If ForceFallback = False Then
-                Dim oTableResult As TableResult = _Client.GetDatatableByName(DataTable, FilterExpression, SortByColumn)
+                Dim oTableResult As TableResult
+
+                Try
+                    oTableResult = _Client.GetDatatableByName(DataTable, FilterExpression, SortByColumn)
+                Catch ex As Exception
+                    _Logger.Error(ex)
+                    oTableResult = Nothing
+                End Try
 
                 If oTableResult Is Nothing OrElse oTableResult.OK = False Then
                     _Logger.Warn("Datatable [{0}] could not be fetched from AppServer Cache. Falling back to direct Database Access.")
+                    Return GetDatatableFromDatabase(FallbackSQL, FallbackType)
                 End If
 
                 Return oTableResult.Table