Make changes to remove VS2015 sematic in test code

OData · Aug 9, 2016 · 23fd32e · 23fd32e
1 parent 997269d
commit 23fd32e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...ODataEndToEnd/Microsoft.OData.Service.Library/DataStoreManager/DefaultDataStoreManager.cs b/...ODataEndToEnd/Microsoft.OData.Service.Library/DataStoreManager/DefaultDataStoreManager.cs
@@ -147,7 +147,13 @@ public void StopTimer()
             private Timer InitTimer()
             {
                 DataStoreTimer = new Timer(_dataStoreLifeTime);
-                DataStoreTimer.Elapsed += (sender, args) => { _timerTimeoutHandler?.Invoke(this, args); };
+                DataStoreTimer.Elapsed += (sender, args) =>
+                {
+                    if (_timerTimeoutHandler != null)
+                    {
+                        _timerTimeoutHandler.Invoke(this, args);
+                    }
+                };
                 DataStoreTimer.Start();
                 return DataStoreTimer;
             }

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Library/Utils/LibraryUtils.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Library/Utils/LibraryUtils.cs
@@ -8,7 +8,12 @@ public static class LibraryUtils
         static public string GetSessionId()
         {
             var session = System.Web.HttpContext.Current.Session;
-            return session?.SessionID;
+            if (session != null)
+            {
+                return session.SessionID;
+            }
+
+            return null;
         }
     }
 }