You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/10/09 08:58:12 UTC
[1/2] storm git commit: Backport STORM-1094(#758) to 0.10.x-branch
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 8cfb6a0fa -> 081b21570
Backport STORM-1094(#758) to 0.10.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1f2c4f72
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1f2c4f72
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1f2c4f72
Branch: refs/heads/0.10.x-branch
Commit: 1f2c4f72b4dcd565a28e96828d6752a12d018e52
Parents: 8cfb6a0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 15:49:36 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 15:49:36 2015 +0900
----------------------------------------------------------------------
external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1f2c4f72/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
index ce18677..c6ce068 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/PartitionManager.java
@@ -136,7 +136,7 @@ public class PartitionManager {
return EmitState.NO_EMITTED;
}
Iterable<List<Object>> tups = KafkaUtils.generateTuples(_spoutConfig, toEmit.msg);
- if (tups != null) {
+ if ((tups != null) && tups.iterator().hasNext()) {
for (List<Object> tup : tups) {
collector.emit(tup, new KafkaMessageId(_partition, toEmit.offset));
}
[2/2] storm git commit: add STORM-1094 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1094 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/081b2157
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/081b2157
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/081b2157
Branch: refs/heads/0.10.x-branch
Commit: 081b215708eed35ba81982b7c9a79605e9c8ead7
Parents: 1f2c4f7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Oct 9 15:57:51 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Oct 9 15:57:51 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/081b2157/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aad9824..0b5f763 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-1094: advance kafka offset when deserializer yields no object
* STORM-1066: Specify current directory when supervisor launches a worker
* STORM-1012: Shaded everything that was not already shaded
* STORM-967: Shaded everything that was not already shaded