diff options
author | antirez <antirez@gmail.com> | 2011-02-07 15:27:45 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2011-02-07 15:27:45 +0100 |
commit | 2446fbb3bb51c38c08692c9242cbb43ef28e7719 (patch) | |
tree | 43f4e3c29cf53190cc4509926707b59ab3cc88a2 | |
parent | 970e813be2baab80dc4efea2bc185d4b2d91f54a (diff) | |
parent | bbaf76ea2f8124f3e68ba4a2558695630a502e03 (diff) | |
download | redis-2446fbb3bb51c38c08692c9242cbb43ef28e7719.tar.gz |
Merge remote branch 'pietern/2.2-brpoplpush' into 2.2
-rw-r--r-- | src/t_list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/t_list.c b/src/t_list.c index 4416d6fd2..47c927db7 100644 --- a/src/t_list.c +++ b/src/t_list.c @@ -826,7 +826,7 @@ int handleClientsWaitingListPush(redisClient *c, robj *key, robj *ele) { addReplyBulk(receiver,ele); return 1; } else { - /* BRPOPLPUSH */ + /* BRPOPLPUSH, note that receiver->db is always equal to c->db. */ dstobj = lookupKeyWrite(receiver->db,dstkey); if (dstobj && checkType(receiver,dstobj,REDIS_LIST)) { decrRefCount(dstkey); @@ -941,7 +941,7 @@ void brpoplpushCommand(redisClient *c) { /* Blocking against an empty list in a multi state * returns immediately. */ - addReply(c, shared.nullmultibulk); + addReply(c, shared.nullbulk); } else { /* The list is empty and the client blocks. */ blockForKeys(c, c->argv + 1, 1, timeout, c->argv[2]); |