instantobjects-cvscommit

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24586/Core

Modified Files:
	InstantPersistence.pas 
Log Message:
fixed #880713

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** InstantPersistence.pas	22 Feb 2005 10:51:01 -0000	1.26
--- InstantPersistence.pas	24 Feb 2005 19:24:42 -0000	1.27
***************
*** 11072,11076 ****
    ConflictAction: TInstantConflictAction; Info: PInstantOperationInfo);
  
!   function MustStoreMap: Boolean;
    var
      I: Integer;
--- 11072,11077 ----
    ConflictAction: TInstantConflictAction; Info: PInstantOperationInfo);
  
!   // Always storing fixes #880713
!   {function MustStoreMap: Boolean;
    var
      I: Integer;
***************
*** 11088,11105 ****
      end;
      Result := False;
!   end;
  
  var
    Resolver: TInstantCustomResolver;
!   MustStore: Boolean;
  begin
!   MustStore := MustStoreMap;
!   if MustStore or AObject.IsPersistent then
    begin
      Resolver := EnsureResolver(Map);
!     if MustStore then
        Resolver.StoreMap(AObject, Map, ConflictAction, Info)
!     else if AObject.IsPersistent then
!       Resolver.DisposeMap(AObject, Map, ConflictAction, Info);
    end;
  end;
--- 11089,11106 ----
      end;
      Result := False;
!   end;}
  
  var
    Resolver: TInstantCustomResolver;
!   {MustStore: Boolean;}
  begin
!   {MustStore := MustStoreMap;}
!   if {MustStore or }AObject.IsPersistent then
    begin
      Resolver := EnsureResolver(Map);
!     {if MustStore then}
        Resolver.StoreMap(AObject, Map, ConflictAction, Info)
!     {else if AObject.IsPersistent then
!       Resolver.DisposeMap(AObject, Map, ConflictAction, Info);}
    end;
  end;