Skip to content

Commit d07cd4e

Browse files
authored
Fix regression that de-serializes ETag as null for custom ITableEntity models (Azure#16986)
1 parent a416fc0 commit d07cd4e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

sdk/tables/Azure.Data.Tables/src/Extensions/DictionaryTableExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ internal static void CastAndRemoveAnnotations(this IDictionary<string, object> e
205205
}
206206

207207
// Populate the ETag if present.
208-
if (entity.TryGetValue(TableConstants.PropertyNames.ETag, out var etag))
208+
if (entity.TryGetValue(TableConstants.PropertyNames.EtagOdata, out var etag))
209209
{
210210
result.ETag = new ETag((etag as string)!);
211211
}

sdk/tables/Azure.Data.Tables/tests/TableClientLiveTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@ public async Task CreatedCustomEntitiesAreRoundtrippedProprly()
888888
Assert.That(entityResults[i].PartitionKey, Is.EqualTo(entitiesToCreate[i].PartitionKey), "The entities should be equivalent");
889889
Assert.That(entityResults[i].RowKey, Is.EqualTo(entitiesToCreate[i].RowKey), "The entities should be equivalent");
890890
Assert.That(entityResults[i].StringTypeProperty, Is.EqualTo(entitiesToCreate[i].StringTypeProperty), "The entities should be equivalent");
891+
Assert.That(entityResults[i].ETag, Is.Not.EqualTo(default(ETag)), $"ETag value should not be default: {entityResults[i].ETag}");
891892
}
892893
}
893894

0 commit comments

Comments
 (0)