Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

preventive conflict resolution to merge pietern/zset-mem

  • Loading branch information...
commit 5ca2f0c49894878be47161f667ae0daf70bb6fd3 1 parent 5171777
@antirez antirez authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  src/t_zset.c
3  src/t_zset.c
@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i
*score = scoreval;
if (isnan(*score)) {
- addReplyError(c,"resulting score is not a number (NaN)");
+ addReplySds(c,
+ sdsnew("-ERR resulting score is not a number (NaN)\r\n"));
/* Note that we don't need to check if the zset may be empty and
* should be removed here, as we can only obtain Nan as score if
Please sign in to comment.
Something went wrong with that request. Please try again.