fix mstime() ommited while comparing if key is already expired

This commit is contained in:
Premysl Hruby 2012-03-28 12:03:32 +02:00 committed by antirez
parent c35b4e845b
commit d48d1309c6

View File

@ -540,7 +540,7 @@ void expireGenericCommand(redisClient *c, long long offset, int unit) {
*
* Instead we take the other branch of the IF statement setting an expire
* (possibly in the past) and wait for an explicit DEL from the master. */
if (milliseconds <= 0 && !server.loading && !server.masterhost) {
if (milliseconds <= mstime() && !server.loading && !server.masterhost) {
robj *aux;
redisAssertWithInfo(c,key,dbDelete(c->db,key));