Fix merge bug

Former-commit-id: cc03c32271997d26ce7f07f96588f126c5939e69
2020-06-07 17:04:46 -04:00 · 2020-06-07 17:04:46 -04:00 · 3004ca80a4
commit 3004ca80a4
parent 4001a99481
1 changed files with 1 additions and 0 deletions
--- a/src/expire.cpp
+++ b/src/expire.cpp
@ -156,6 +156,7 @@ void activeExpireCycleExpire(redisDb *db, expireEntry &e, long long now) {
    {
        // We need to resort the expire entry since it may no longer be in the correct position
        db->resortExpire(e);
+    }

    if (deleted)
    {