updates

OData · Jun 2, 2021 · f9f672d · f9f672d
1 parent b764571
commit f9f672d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs b/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
@@ -107,7 +107,7 @@ internal DeltaSet<TStructuralType> CopyChangedValues(PatchMethodHandler<TStructu
 
                     DeltaDeletedEntityObject<TStructuralType> deletedObj = changedObj as DeltaDeletedEntityObject<TStructuralType>;
 
-                    if (deletedObj != null || patchStatus == PatchStatus.Failure)
+                    if (patchStatus == PatchStatus.Failure || (deletedObj != null && patchStatus == PatchStatus.NotFound))
                     {
                         IDeltaSetItem deltaSetItem = changedObj;
 

diff --git a/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/BulkOperation/BulkInsertController.cs b/test/E2ETest/Microsoft.Test.E2E.AspNet.OData/BulkOperation/BulkInsertController.cs
@@ -298,8 +298,6 @@ public ITestActionResult PatchUnTypedFriends(int key, [FromBody] EdmChangedObjec
                     }
                 }
 
-
-
                 return Ok(changedObjColl);
             }
             else if(key ==2)
@@ -310,12 +308,12 @@ public ITestActionResult PatchUnTypedFriends(int key, [FromBody] EdmChangedObjec
 
                 var friendCollection = new FriendColl<IEdmStructuredObject>() { entity };
 
-                var changedObjColl = friendColl.Patch(new EmployeeEdmPatchHandler(entitytype));
+                var changedObjColl = PatchWithUsersMethodTypeLess(key, friendColl);
 
                 object obj;
-                Assert.Single(friendCollection);
+                Assert.Single(changedObjColl);
 
-                friendCollection.First().TryGetPropertyValue("Age", out obj);
+                changedObjColl.First().TryGetPropertyValue("Age", out obj);
                 Assert.Equal(35, obj);
 
                 return Ok(changedObjColl);