Commit 37fb606c authored by antirez's avatar antirez
Browse files

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

parents 1898e6ce b221ca41
...@@ -1436,7 +1436,7 @@ void xreadCommand(client *c) { ...@@ -1436,7 +1436,7 @@ void xreadCommand(client *c) {
* synchronously in case the group top item delivered is smaller * synchronously in case the group top item delivered is smaller
* than what the stream has inside. */ * than what the stream has inside. */
streamID *last = &groups[i]->last_id; streamID *last = &groups[i]->last_id;
if (streamCompareID(&s->last_id, last) > 0) { if (s->length && (streamCompareID(&s->last_id, last) > 0)) {
serve_synchronously = 1; serve_synchronously = 1;
*gt = *last; *gt = *last;
} }
...@@ -1444,7 +1444,7 @@ void xreadCommand(client *c) { ...@@ -1444,7 +1444,7 @@ void xreadCommand(client *c) {
} else { } else {
/* For consumers without a group, we serve synchronously if we can /* For consumers without a group, we serve synchronously if we can
* actually provide at least one item from the stream. */ * actually provide at least one item from the stream. */
if (streamCompareID(&s->last_id, gt) > 0) { if (s->length && (streamCompareID(&s->last_id, gt) > 0)) {
serve_synchronously = 1; serve_synchronously = 1;
} }
} }
......
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