diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-01 13:14:04 +0000 |
| commit | 4a9055d4465d5d6059612e7c89f2b5774efc0e18 (patch) | |
| tree | f5d146248431ce35f1ad810267024af4eb907bdf /synapse/storage/room.py | |
| parent | Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-4a9055d4465d5d6059612e7c89f2b5774efc0e18.tar.xz | |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse v0.18.2
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 2ef13d7403..11813b44f6 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -320,6 +320,9 @@ class RoomStore(SQLBaseStore): txn.execute(sql, (prev_id, current_id, limit,)) return txn.fetchall() + if prev_id == current_id: + return defer.succeed([]) + return self.runInteraction( "get_all_new_public_rooms", get_all_new_public_rooms ) |