Merge pull request Terry-Mao#309 from iwannay/master

修复切房间造成的房间内链表回路
andsontan · Jun 11, 2019 · d5d3d0e · d5d3d0e
2 parents 2a5ab74 + 364cc69
commit d5d3d0e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/internal/comet/bucket.go b/internal/comet/bucket.go
@@ -85,13 +85,14 @@ func (b *Bucket) ChangeRoom(nrid string, ch *Channel) (err error) {
 		b.rooms[nrid] = nroom
 	}
 	b.cLock.Unlock()
+	if oroom != nil && oroom.Del(ch) {
+		b.DelRoom(oroom)
+	}
+
 	if err = nroom.Put(ch); err != nil {
 		return
 	}
 	ch.Room = nroom
-	if oroom != nil && oroom.Del(ch) {
-		b.DelRoom(oroom)
-	}
 	return
 }