Feedback

Author: JunTaoLuo

src/Microsoft.AspNetCore.Session/DistributedSession.cs

@@ -76,6 +76,7 @@ public bool IsAvailable
         {
             get
             {
+                Load();
                 return _isAvailable;
             }
         }
@@ -85,7 +86,7 @@ public string Id
             get
             {
                 Load();
-                if (IsAvailable)
+                if (_isAvailable)
                 {
                     if (_sessionId == null)
                     {
@@ -95,7 +96,7 @@ public string Id
                 }
                 else
                 {
-                    return default(string);
+                    return string.Empty;
                 }
             }
         }
@@ -105,7 +106,7 @@ private byte[] IdBytes
             get
             {
                 Load();
-                if (IsAvailable)
+                if (_isAvailable)
                 {
                     if (_sessionIdBytes == null)
                     {
@@ -116,7 +117,7 @@ private byte[] IdBytes
                 }
                 else
                 {
-                    return default(byte[]);
+                    return null;
                 }
             }
         }
@@ -126,21 +127,21 @@ public IEnumerable<string> Keys
             get
             {
                 Load();
-                if (IsAvailable)
+                if (_isAvailable)
                 {
                     return _store.Keys.Select(key => key.KeyString);
                 }
                 else
                 {
-                    return default(IEnumerable<string>);
+                    return Enumerable.Empty<string>();
                 }
             }
         }
 
         public bool TryGetValue(string key, out byte[] value)
         {
             Load();
-            if (IsAvailable)
+            if (_isAvailable)
             {
                 return _store.TryGetValue(new EncodedKey(key), out value);
             }
@@ -166,7 +167,7 @@ public void Set(string key, byte[] value)
             }
 
             Load();
-            if (IsAvailable)
+            if (_isAvailable)
             {
                 if (!_tryEstablishSession())
                 {
@@ -182,7 +183,7 @@ public void Set(string key, byte[] value)
         public void Remove(string key)
         {
             Load();
-            if (IsAvailable)
+            if (_isAvailable)
             {
                 _isModified |= _store.Remove(new EncodedKey(key));
             }
@@ -191,7 +192,7 @@ public void Remove(string key)
         public void Clear()
         {
             Load();
-            if (IsAvailable)
+            if (_isAvailable)
             {
                 _isModified |= _store.Count > 0;
                 _store.Clear();

test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs

@@ -506,9 +506,9 @@ public async Task SessionLogsCacheReadException()
                     {
                         byte[] value;
                         Assert.False(context.Session.TryGetValue("key", out value));
-                        Assert.Equal(default(byte[]), value);
-                        Assert.Equal(default(string), context.Session.Id);
-                        Assert.Equal(default(IEnumerable<string>), context.Session.Keys);
+                        Assert.Equal(null, value);
+                        Assert.Equal(string.Empty, context.Session.Id);
+                        Assert.False(context.Session.Keys.Any());
                         return Task.FromResult(0);
                     });
                 })