#4223 Restore app context if operation fails w/ no local clone

MarimerLLC · Nov 4, 2024 · 1fe0545 · 1fe0545
1 parent 5964aea
commit 1fe0545
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/Source/Csla/DataPortalT.cs b/Source/Csla/DataPortalT.cs
@@ -8,6 +8,7 @@
 
 using System.Globalization;
 using Csla.Configuration;
+using Csla.Core;
 using Csla.DataPortalClient;
 using Csla.Properties;
 
@@ -470,9 +471,24 @@ internal async Task<T> DoUpdateAsync(T obj, bool isSync, CancellationToken ct =
             // clone original object before saving
             if (obj is ICloneable cloneable)
               obj = (T)cloneable.Clone();
+            result = await Cache.GetDataPortalResultAsync(objectType, obj, operation,
+              async () => await proxy.Update(obj, dpContext, isSync));
+          }
+          else
+          {
+            var contextManager = _applicationContext.ApplicationContextAccessor;
+            try
+            {
+              result = await Cache.GetDataPortalResultAsync(objectType, obj, operation,
+                async () => await proxy.Update(obj, dpContext, isSync));
+            }
+            catch
+            {
+              if (obj is IUseApplicationContext useContext)
+                useContext.ApplicationContext.ApplicationContextAccessor = contextManager;
+              throw;
+            }
           }
-          result = await Cache.GetDataPortalResultAsync(objectType, obj, operation,
-            async () => await proxy.Update(obj, dpContext, isSync));
         }
         catch (AggregateException ex)
         {