Commit 522c3255 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:antirez/redis into unstable

parents 02796ba7 8853698a
...@@ -384,15 +384,12 @@ robj *hashTypeCurrentObject(hashTypeIterator *hi, int what) { ...@@ -384,15 +384,12 @@ robj *hashTypeCurrentObject(hashTypeIterator *hi, int what) {
} else { } else {
dst = createStringObjectFromLongLong(vll); dst = createStringObjectFromLongLong(vll);
} }
} else if (hi->encoding == REDIS_ENCODING_HT) { } else if (hi->encoding == REDIS_ENCODING_HT) {
hashTypeCurrentFromHashTable(hi, what, &dst); hashTypeCurrentFromHashTable(hi, what, &dst);
incrRefCount(dst); incrRefCount(dst);
} else { } else {
redisPanic("Unknown hash encoding"); redisPanic("Unknown hash encoding");
} }
return dst; return dst;
} }
......
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