Fixed regression where server restarts don't cause the client to catc…

…h back up for the InProcessMessageBus. - Added unit test Fixes #24
SignalR · Apr 13, 2012 · 1d6ce39 · 1d6ce39
1 parent e8040b5
commit 1d6ce39
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/SignalR.Tests/InProcessMessageBusFacts.cs b/SignalR.Tests/InProcessMessageBusFacts.cs
@@ -25,7 +25,7 @@ public void ReturnsAllMessagesWhenLastMessageIdIsLessThanAllMessages()
                 var result = bus.GetMessages(new[] { "foo" }, "1", CancellationToken.None).Result;
                 Assert.Equal(2, result.Messages.Count);
             }
-            
+
             [Fact]
             public void ReturnsMessagesGreaterThanLastMessageIdWhenLastMessageIdNotInStore()
             {
@@ -45,6 +45,25 @@ public void ReturnsMessagesGreaterThanLastMessageIdWhenLastMessageIdNotInStore()
                 var result = bus.GetMessages(new[] { "foo" }, "3", CancellationToken.None).Result;
                 Assert.Equal(2, result.Messages.Count);
             }
+
+            [Fact]
+            public void GetAllSinceReturnsAllMessagesIfIdGreaterThanMaxId()
+            {
+                var trace = new TraceManager();
+                var bus = new InProcessMessageBus(trace, false);
+
+                for (int i = 0; i < 10; i++)
+                {
+                    bus.Send("testclient", "a", i).Wait();
+                }
+
+                var result = bus.GetMessages(new[] { "a" }, "100", CancellationToken.None).Result;
+                Assert.Equal(10, result.Messages.Count);
+                for (int i = 0; i < 10; i++)
+                {
+                    Assert.Equal(i, result.Messages[i].Value);
+                }
+            }
         }
     }
 }
diff --git a/SignalR/MessageBus/InProcessMessageBus.cs b/SignalR/MessageBus/InProcessMessageBus.cs
@@ -103,7 +103,15 @@ public Task<MessageResult> GetMessages(IEnumerable<string> eventKeys, string id,
                 _cacheLock.EnterReadLock();
                 T uuid = _idGenerator.ConvertFromString(id);
 
-                if (uuid.CompareTo(_lastMessageId) >= 0)
+                if (uuid.CompareTo(_lastMessageId) > 0)
+                {
+                    // BUG 24: Connection already has the latest message, so reset the id
+                    // This can happen if the server is reset (appdomain or entire server incase of self host)
+                    _trace.Source.TraceInformation("MessageBus: Connection asking for message id {0} when the largest is {1}. Resetting id", id, _lastMessageId);
+                    Debug.WriteLine("MessageBus: Connection asking for message id {0} when the largest is {1}. Resetting id", id, _lastMessageId);
+                    uuid = default(T);
+                }
+                else if (uuid.CompareTo(_lastMessageId) == 0)
                 {
                     // Connection already has the latest message, so start wating
                     _trace.Source.TraceInformation("MessageBus: Connection waiting for new messages from id {0}", id);
@@ -158,7 +166,7 @@ public Task Send(string connectionId, string eventKey, object value)
                 Broadcast(eventKey, message);
             }
             finally
-            {    
+            {
                 _cacheLock.ExitWriteLock();
             }
 
@@ -270,7 +278,7 @@ private Task<MessageResult> WaitForMessages(IEnumerable<string> eventKeys, Cance
                 {
                     return;
                 }
-                
+
                 if (Interlocked.Exchange(ref callbackCalled, 1) == 0)
                 {
                     tcs.TrySetResult(GetMessageResult(messages));