Fixed issue AttackPattern#33 where multiple apps startup causes excep…

…tion to be thrown due to multiple session saving race.
JimiC · Oct 22, 2015 · d3bc8fc · xmedeko · Oct 22, 2015 · JimiC
1 parent 3580185
commit d3bc8fc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Source/CSharpAnalytics/AutoMeasurement/BaseAutoMeasurement.cs b/Source/CSharpAnalytics/AutoMeasurement/BaseAutoMeasurement.cs
@@ -69,12 +69,16 @@ public async void Start(MeasurementConfiguration configuration, string launchKin
                 sessionManager = new SessionManager(sessionState, configuration.SampleRate);
 				await StartRequesterAsync();
 
-				if (delayedOptOut != null) SetOptOut(delayedOptOut.Value);
+                // Preserve 'delayedOptOut' value to use in condition checking
+                var hasDelayedOptOut = delayedOptOut;
+                if (hasDelayedOptOut.HasValue) SetOptOut(delayedOptOut.GetValueOrDefault());
 
                 Client.Configure(configuration, sessionManager, GetEnvironment(), Add);
 
                 // Sometimes apps crash so preserve at least session number and visitor id on launch
-                await Save(sessionManager.GetState(), SessionStorageName);
+                // Avoid re-saving if a delayed optout was set (save already occurred in 'SetOptOut')
+                if (!hasDelayedOptOut.HasValue)
+                    await Save(sessionManager.GetState(), SessionStorageName);
 
                 HookEvents();
             }