From: antirez <antirez@gmail.com>
Date: Tue, 3 Apr 2012 13:10:42 +0000 (+0200)
Subject: Another fix for MIGRATE.
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/fb8409a5c8b46a1663d612c256a1a952c2d8d495

Another fix for MIGRATE.
---

diff --git a/src/migrate.c b/src/migrate.c
index 1e36a84d..aeb412b5 100644
--- a/src/migrate.c
+++ b/src/migrate.c
@@ -130,7 +130,7 @@ void migrateCommand(redisClient *c) {
     int fd;
     long timeout;
     long dbid;
-    long long ttl;
+    long long ttl, expireat;
     robj *o;
     rio cmd, payload;
 
@@ -168,13 +168,16 @@ void migrateCommand(redisClient *c) {
     redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"SELECT",6));
     redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,dbid));
 
-    ttl = getExpire(c->db,c->argv[3])-mstime();
-    if (ttl < 1) ttl = 1;
+    expireat = getExpire(c->db,c->argv[3]);
+    if (expireat != -1) {
+        ttl = expireat-mstime();
+        if (ttl < 1) ttl = 1;
+    }
     redisAssertWithInfo(c,NULL,rioWriteBulkCount(&cmd,'*',4));
     redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,"RESTORE",7));
     redisAssertWithInfo(c,NULL,c->argv[3]->encoding == REDIS_ENCODING_RAW);
     redisAssertWithInfo(c,NULL,rioWriteBulkString(&cmd,c->argv[3]->ptr,sdslen(c->argv[3]->ptr)));
-    redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,(ttl == -1) ? 0 : ttl));
+    redisAssertWithInfo(c,NULL,rioWriteBulkLongLong(&cmd,(expireat==-1) ? 0 : ttl));
 
     /* Finally the last argument that is the serailized object payload
      * in the DUMP format. */