From 331a5ecc6a65212e27e8a4551ce4af3321598d1a Mon Sep 17 00:00:00 2001 From: Praveen Devarao Date: Sun, 10 Jan 2016 10:24:00 +0530 Subject: [PATCH 1/2] Doc change as per KAFKA-3044 --- .../org/apache/kafka/clients/consumer/KafkaConsumer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index 7ea293d74bc37..ff4e571df60e9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -798,8 +798,9 @@ public void assign(List partitions) { * offset for the subscribed list of partitions * * - * @param timeout The time, in milliseconds, spent waiting in poll if data is not available. If 0, returns - * immediately with any records that are available now. Must not be negative. + * @param timeout The time, in milliseconds, spent waiting in poll if data is not available in buffer. + * If 0, returns immediately with any records that are available currently in buffer else returns empty. + * Must not be negative. * @return map of topic to records since the last fetch for the subscribed list of topics and partitions * * @throws org.apache.kafka.clients.consumer.InvalidOffsetException if the offset for a partition or set of From 5e2f89d84dc1bf6e161e22c4f3e86924aa6cce8b Mon Sep 17 00:00:00 2001 From: Praveen Devarao Date: Mon, 11 Jan 2016 11:06:36 +0530 Subject: [PATCH 2/2] Grammar changes --- .../java/org/apache/kafka/clients/consumer/KafkaConsumer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index ff4e571df60e9..2f7813929168d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -798,8 +798,8 @@ public void assign(List partitions) { * offset for the subscribed list of partitions * * - * @param timeout The time, in milliseconds, spent waiting in poll if data is not available in buffer. - * If 0, returns immediately with any records that are available currently in buffer else returns empty. + * @param timeout The time, in milliseconds, spent waiting in poll if data is not available in the buffer. + * If 0, returns immediately with any records that are available currently in the buffer, else returns empty. * Must not be negative. * @return map of topic to records since the last fetch for the subscribed list of topics and partitions *