Test "Turning off AOF kills the background writing child if any" is now more reliable.

[redis.git] / src / t_list.c

diff --git a/src/t_list.c b/src/t_list.c
index 2be8074a7cca3b4c73d8f608bba0ecfe4282082d..ca03916b953fd1eb91d9e80b506b6646d97e45f4 100644 (file)
--- a/src/t_list.c
+++ b/src/t_list.c
@@ -699,6 +699,8 @@ void rpoplpushCommand(redisClient *c) {
         checkType(c,sobj,REDIS_LIST)) return;
 
     if (listTypeLength(sobj) == 0) {
+        /* This may only happen after loading very old RDB files. Recent
+         * versions of Redis delete keys of empty lists. */
         addReply(c,shared.nullbulk);
     } else {
         robj *dobj = lookupKeyWrite(c->db,c->argv[2]);
@@ -910,7 +912,7 @@ int getTimeoutFromObjectOrReply(redisClient *c, robj *object, time_t *timeout) {
         return REDIS_ERR;
     }
 
-    if (tval > 0) tval += time(NULL);
+    if (tval > 0) tval += server.unixtime;
     *timeout = tval;
 
     return REDIS_OK;