bug fix - root element

viniciussanchez · Jul 24, 2024 · df1cd1e · df1cd1e
1 parent ac43c24
commit df1cd1e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/DataSet.Serialize.pas b/src/DataSet.Serialize.pas
@@ -372,6 +372,7 @@ procedure TDataSetSerializeHelper.LoadFromJSON(const AJSONObject: TJSONObject; c
     LJSONSerialize := TJSONSerialize.Create(AJSONObject, AOwns)
   else
   begin
+    LJSON := nil;
     try
       {$IF DEFINED(FPC)}
       LJSON := AJSONObject.Find(ARootElement);
@@ -383,14 +384,17 @@ procedure TDataSetSerializeHelper.LoadFromJSON(const AJSONObject: TJSONObject; c
           LJSON := AJSONObject.FindValue(ARootElement);
         {$IFEND}
       {$ENDIF}	  
-      if not Assigned(LJSON) then
-        raise Exception.Create('Root element not found!');
-      if LJSON.InheritsFrom(TJSONArray) then
-        LJSONSerialize := TJSONSerialize.Create(LJSON.Clone as TJSONArray, True)
+      if Assigned(LJSON) then
+      begin
+        if LJSON.InheritsFrom(TJSONArray) then
+          LJSONSerialize := TJSONSerialize.Create(LJSON.Clone as TJSONArray, True)
+        else
+          LJSONSerialize := TJSONSerialize.Create(LJSON.Clone as TJSONObject, True);
+      end
       else
-        LJSONSerialize := TJSONSerialize.Create(LJSON.Clone as TJSONObject, True);
+        LJSONSerialize := TJSONSerialize.Create(AJSONObject, AOwns);
     finally
-      if AOwns then
+      if AOwns and Assigned(LJSON) then
         AJSONObject.Free;
     end;
   end;