Commit 2446fbb3 authored by antirez's avatar antirez
Browse files

Merge remote branch 'pietern/2.2-brpoplpush' into 2.2

parents 970e813b bbaf76ea
...@@ -826,7 +826,7 @@ int handleClientsWaitingListPush(redisClient *c, robj *key, robj *ele) { ...@@ -826,7 +826,7 @@ int handleClientsWaitingListPush(redisClient *c, robj *key, robj *ele) {
addReplyBulk(receiver,ele); addReplyBulk(receiver,ele);
return 1; return 1;
} else { } else {
/* BRPOPLPUSH */ /* BRPOPLPUSH, note that receiver->db is always equal to c->db. */
dstobj = lookupKeyWrite(receiver->db,dstkey); dstobj = lookupKeyWrite(receiver->db,dstkey);
if (dstobj && checkType(receiver,dstobj,REDIS_LIST)) { if (dstobj && checkType(receiver,dstobj,REDIS_LIST)) {
decrRefCount(dstkey); decrRefCount(dstkey);
...@@ -941,7 +941,7 @@ void brpoplpushCommand(redisClient *c) { ...@@ -941,7 +941,7 @@ void brpoplpushCommand(redisClient *c) {
/* Blocking against an empty list in a multi state /* Blocking against an empty list in a multi state
* returns immediately. */ * returns immediately. */
addReply(c, shared.nullmultibulk); addReply(c, shared.nullbulk);
} else { } else {
/* The list is empty and the client blocks. */ /* The list is empty and the client blocks. */
blockForKeys(c, c->argv + 1, 1, timeout, c->argv[2]); blockForKeys(c, c->argv + 1, 1, timeout, c->argv[2]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment