fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2011-02-07 15:28:01 +01:00
commit a8cc969cd4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/t_list.c
View File

@ -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) {
/* 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]);