From 8b13cb00378a640b6f2b8032f4de3baf788128af Mon Sep 17 00:00:00 2001
From: Rickard Liljeberg <rickard@liljeberg.se>
Date: Fri, 9 Apr 2021 17:40:20 +0200
Subject: [PATCH] Patch request for phone fix

If user already had phone number of a type, say "work" and then got another number added of type "mobile" the code would crash during the patch request.
---
 .../Protocol/Core2EnterpriseUserExtensions.cs              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Core2EnterpriseUserExtensions.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Core2EnterpriseUserExtensions.cs
index 69cdaab5..0a507724 100644
--- a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Core2EnterpriseUserExtensions.cs
+++ b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Core2EnterpriseUserExtensions.cs
@@ -929,8 +929,8 @@ private static void PatchPhoneNumbers(this Core2EnterpriseUser user, PatchOperat
                 return;
             }
 
-            PhoneNumber phoneNumber;
-            PhoneNumber phoneNumberExisting;
+            PhoneNumber phoneNumber = null;
+            PhoneNumber phoneNumberExisting = null;
             if (user.PhoneNumbers != null)
             {
                 phoneNumberExisting =
@@ -941,7 +941,8 @@ private static void PatchPhoneNumbers(this Core2EnterpriseUser user, PatchOperat
                             (PhoneNumber item) =>
                                 string.Equals(subAttribute.ComparisonValue, item.ItemType, StringComparison.Ordinal));
             }
-            else
+            
+            if(null == phoneNumber)
             {
                 phoneNumberExisting = null;
                 phoneNumber =