Merge pull request #242 from wizzat/pr_225

Resolve merge conflict in PR #225
2014-09-23 15:13:13 -07:00
parent 2e3d6dbde0 2fb6e23b32
commit c063e30a12
1 changed files with 1 additions and 1 deletions
--- a/kafka/consumer/simple.py
+++ b/kafka/consumer/simple.py
@@ -306,7 +306,7 @@ class SimpleConsumer(Consumer):
                    if self.max_buffer_size is None:
                        buffer_size *= 2
                    else:
-                        buffer_size = max(buffer_size * 2,
+                        buffer_size = min(buffer_size * 2,
                                          self.max_buffer_size)
                    log.warn("Fetch size too small, increase to %d (2x) "
                             "and retry", buffer_size)