Fix dead lock adls table on reset (#111)

Bertverbeek4PS · Apr 10, 2024 · f33e983 · f33e983
2 parents 2215536 + 2d7c46d
commit f33e983
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/businessCentral/app/src/Setup.Codeunit.al b/businessCentral/app/src/Setup.Codeunit.al
@@ -17,6 +17,7 @@ codeunit 82560 "ADLSE Setup"
         AllObjectsWithCaption: Page "All Objects with Caption";
     begin
         AllObjWithCaption.SetRange("Object Type", AllObjWithCaption."Object Type"::Table);
+        AllObjWithCaption.SetFilter("Object ID", '<>%1', Database::"ADLSE Deleted Record");
 
         AllObjectsWithCaption.Caption(SelectTableLbl);
         AllObjectsWithCaption.SetTableView(AllObjWithCaption);

diff --git a/businessCentral/app/src/Table.Table.al b/businessCentral/app/src/Table.Table.al
@@ -28,7 +28,12 @@ table 82561 "ADLSE Table"
             trigger OnValidate()
             var
                 ADLSEExternalEvents: Codeunit "ADLSE External Events";
+                ADLSETableErr: Label 'The ADLSE Table table cannot be disabled.';
             begin
+                if Rec."Table ID" = Database::"ADLSE Table" then
+                    if xRec.Enabled = false then
+                        Error(ADLSETableErr);
+
                 if Rec.Enabled then
                     CheckExportingOnlyValidFields();
 
@@ -176,8 +181,10 @@ table 82561 "ADLSE Table"
     begin
         if Rec.FindSet(true) then
             repeat
-                Rec.Enabled := true;
-                Rec.Modify();
+                if not Rec.Enabled then begin
+                    Rec.Enabled := true;
+                    Rec.Modify();
+                end;
 
                 ADLSETableLastTimestamp.SaveUpdatedLastTimestamp(Rec."Table ID", 0);
                 ADLSETableLastTimestamp.SaveDeletedLastEntryNo(Rec."Table ID", 0);