mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't accidentally try to type-assert nil

Browse source
This commit is contained in:
Neil Alexander 2020-04-22 10:12:14 +01:00
parent 8642c0b2fa
commit c3dd404778
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/caching/inmemorylru.go
View file

@ -25,9 +25,14 @@ func (c *InMemoryLRUCache) GetRoomVersion(roomID string) (gomatrixserverlib.Room
return "", false return "", false
} }
c.roomVersionsMutex.RLock() c.roomVersionsMutex.RLock()
defer c.roomVersionsMutex.RUnlock()
val, found := c.roomVersions.Get(roomID) val, found := c.roomVersions.Get(roomID)
return val.(gomatrixserverlib.RoomVersion), found c.roomVersionsMutex.RUnlock()
if found && val != nil {
if roomVersion, ok := val.(gomatrixserverlib.RoomVersion); ok {
return roomVersion, true
}
}
return "", false
} }
func (c *InMemoryLRUCache) StoreRoomVersion(roomID string, roomVersion gomatrixserverlib.RoomVersion) { func (c *InMemoryLRUCache) StoreRoomVersion(roomID string, roomVersion gomatrixserverlib.RoomVersion) {