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 2016/09/23 01:21:19 UTC
[1/3] storm git commit: STORM-2003 : Make sure config contains TOPIC
before get it
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch fc4179c0f -> 01c9923d0
STORM-2003 : Make sure config contains TOPIC before get it
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c11f2b1c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c11f2b1c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c11f2b1c
Branch: refs/heads/1.0.x-branch
Commit: c11f2b1c9b85f0a43dc5c23472dff951cf45c22a
Parents: fc4179c
Author: darionyaphet <da...@gmail.com>
Authored: Mon Jul 25 22:26:35 2016 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:20:47 2016 +0900
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c11f2b1c/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
index 0ceac3a..31eaac5 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java
@@ -98,7 +98,11 @@ public class KafkaBolt<K, V> extends BaseRichBolt {
//for backward compatibility.
if(topicSelector == null) {
- this.topicSelector = new DefaultTopicSelector((String) stormConf.get(TOPIC));
+ if(stormConf.containsKey(TOPIC)) {
+ this.topicSelector = new DefaultTopicSelector((String) stormConf.get(TOPIC));
+ } else {
+ throw new IllegalArgumentException("topic should be specified in bolt's configuration");
+ }
}
producer = new KafkaProducer<>(boltSpecfiedProperties);
[2/3] storm git commit: Merge branch 'STORM-2003-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2003-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/47246188
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/47246188
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/47246188
Branch: refs/heads/1.0.x-branch
Commit: 47246188ad674e4df2a200b7430bf58f731fc021
Parents: fc4179c c11f2b1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:20:57 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:20:57 2016 +0900
----------------------------------------------------------------------
.../src/jvm/org/apache/storm/kafka/bolt/KafkaBolt.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] storm git commit: add STORM-2003 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2003 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/01c9923d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/01c9923d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/01c9923d
Branch: refs/heads/1.0.x-branch
Commit: 01c9923d0a91758cb1e483f4267cc637bc58160e
Parents: 4724618
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Sep 23 10:21:10 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Sep 23 10:21:10 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/01c9923d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a62ef6e..899ee64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2003: Make sure config contains TOPIC before get it
* STORM-1567: in defaults.yaml 'topology.disable.loadaware' should be 'topology.disable.loadaware.messaging'
* STORM-1987: Fix TridentKafkaWordCount arg handling in distributed mode.
* STORM-1969: Modify HiveTopology to show usage of non-partition table.