Skip to content

Commit ea9c6bd

Browse files
authored
Mitigate ITrackingItem.RawData == null issue (#362)
* Mitigate `ITrackingItem.RawData == null` issue * Correct missing resources
1 parent 27aa6a0 commit ea9c6bd

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Extensions/Xtensive.Orm.Tracking/Internals/TrackingItem.cs

+5-3
Original file line numberDiff line numberDiff 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

Version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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

0 commit comments

Comments
 (0)