Merge 2b4f700 into 7554818

server/rescache/eventSubscription.go

@@ -208,7 +208,7 @@ func (e *EventSubscription) addCount() {
 // in the unsubscribe queue if count reaches zero.
 func (e *EventSubscription) removeCount(n int64) {
 	e.count -= n
-	if e.count == 0 {
+	if e.count == 0 && n != 0 {
 		e.cache.unsubQueue.Add(e)
 	}
 }

test/29delete_event_test.go

@@ -123,3 +123,35 @@ func TestDeleteEvent_FollowedByResubscribe_IsNotCached(t *testing.T) {
 		c.GetEvent(t).Equals(t, "test.model.custom", common.CustomEvent())
 	})
 }
+
+func TestDeleteEvent_OnModelQueuedForEviction_DoesNothing(t *testing.T) {
+	runTest(t, func(s *Session) {
+		c := s.Connect()
+		subscribeToTestModel(t, s, c)
+
+		// Unsubscribe to resource
+		c.Request("unsubscribe.test.model", nil).GetResponse(t)
+
+		// Send delete event
+		s.ResourceEvent("test.model", "delete", nil)
+
+		// Validate the delete event is sent to client
+		c.AssertNoEvent(t, "test.model")
+	})
+}
+
+func TestDeleteEvent_OnCollectionQueuedForEviction_DoesNothing(t *testing.T) {
+	runTest(t, func(s *Session) {
+		c := s.Connect()
+		subscribeToTestCollection(t, s, c)
+
+		// Unsubscribe to resource
+		c.Request("unsubscribe.test.collection", nil).GetResponse(t)
+
+		// Send delete event
+		s.ResourceEvent("test.collection", "delete", nil)
+
+		// Validate the delete event is sent to client
+		c.AssertNoEvent(t, "test.collection")
+	})
+}

test/ws.go

@@ -118,6 +118,7 @@ func (c *Conn) Disconnect() {
 	c.ws.Close()
 }
 
+// PanicOnError panics if the connection has encountered an error.
 func (c *Conn) PanicOnError() {
 	err := c.Error()
 	if err != nil {