Merge pull request #864 from zalando/ARUHA-1624-out-of-memory

Aruha 1624 out of memory
zalando · Apr 25, 2018 · 46f9610 · 46f9610
2 parents f56de8a + 9a90b69
commit 46f9610
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Fixed commit for subscriptions that use direct assignment of partitions
+- Fixed OutOfMemoryError when using huge values for batch_limit and max_uncommitted_events
+
 
 ## [2.6.3] - 2018-04-10
 

diff --git a/src/main/java/org/zalando/nakadi/service/subscription/state/PartitionData.java b/src/main/java/org/zalando/nakadi/service/subscription/state/PartitionData.java
@@ -93,7 +93,7 @@ long getBytesInMemory() {
     }
 
     private List<ConsumedEvent> extract(final int count) {
-        final List<ConsumedEvent> result = new ArrayList<>(count);
+        final List<ConsumedEvent> result = new ArrayList<>();
         for (int i = 0; i < count && !nakadiEvents.isEmpty(); ++i) {
             final ConsumedEvent event = nakadiEvents.remove(0);
             bytesInMemory -= event.getEvent().length;