File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed
Extensions/Xtensive.Orm.Tracking/Internals Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -37,15 +37,17 @@ public void MergeWith(ITrackingItem source)
3737 return ;
3838 }
3939
40- ArgumentNullException . ThrowIfNull ( source . RawData ) ;
41-
4240 if ( State == TrackingItemState . Created && source . State == TrackingItemState . Changed ) {
41+ ArgumentNullException . ThrowIfNull ( source . RawData ) ;
4342 State = TrackingItemState . Created ;
4443 MergeWith ( source . RawData . Difference ) ;
4544 return ;
4645 }
4746
48- MergeWith ( source . RawData . Difference ) ;
47+ if ( source . RawData is not null ) {
48+ MergeWith ( source . RawData . Difference ) ;
49+ }
50+
4951 State = source . State ;
5052 }
5153
Original file line number Diff line number Diff line change 22<Project xmlns =" http://schemas.microsoft.com/developer/msbuild/2003" >
33
44<PropertyGroup >
5- <DoVersion >7.2.172 </DoVersion >
5+ <DoVersion >7.2.173 </DoVersion >
66 <DoVersionSuffix >servicetitan</DoVersionSuffix >
77</PropertyGroup >
88
You can’t perform that action at this time.
0 commit comments