Permalink
Browse files

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

  • Loading branch information...
2 parents 970e813 + bbaf76e commit 2446fbb3bb51c38c08692c9242cbb43ef28e7719 @antirez committed Feb 7, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/t_list.c
View
@@ -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]);

0 comments on commit 2446fbb

Please sign in to comment.