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/08/03 00:54:42 UTC

[1/3] storm git commit: STORM-933:NullPointerException during KafkaSpout deactivation

Repository: storm
Updated Branches:
  refs/heads/master 6de597a6d -> aae4ba63e


STORM-933:NullPointerException during KafkaSpout deactivation


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2a1a417f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2a1a417f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2a1a417f

Branch: refs/heads/master
Commit: 2a1a417f922cbce6239b5c85eb75363b92b9a2d0
Parents: 14fdab8
Author: caofangkun <ca...@gmail.com>
Authored: Fri Jul 31 10:36:42 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Fri Jul 31 10:36:42 2015 +0800

----------------------------------------------------------------------
 external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2a1a417f/external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java b/external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java
index 0a8fe36..3af648c 100644
--- a/external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java
+++ b/external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java
@@ -33,7 +33,7 @@ public class ZkCoordinator implements PartitionCoordinator {
     int _totalTasks;
     String _topologyInstanceId;
     Map<Partition, PartitionManager> _managers = new HashMap();
-    List<PartitionManager> _cachedList;
+    List<PartitionManager> _cachedList = new ArrayList<PartitionManager>();
     Long _lastRefreshTime = null;
     int _refreshFreqMs;
     DynamicPartitionConnections _connections;


[2/3] storm git commit: Merge branch 'storm-933' of https://github.com/caofangkun/apache-storm

Posted by ka...@apache.org.
Merge branch 'storm-933' of https://github.com/caofangkun/apache-storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/376fa50d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/376fa50d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/376fa50d

Branch: refs/heads/master
Commit: 376fa50d2e8f5d12e9e7b91a6895e6b6face23a3
Parents: 6de597a 2a1a417
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 3 07:46:02 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 3 07:46:02 2015 +0900

----------------------------------------------------------------------
 external/storm-kafka/src/jvm/storm/kafka/ZkCoordinator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[3/3] storm git commit: add STORM-933 to CHANGELOG.md

Posted by ka...@apache.org.
add STORM-933 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/aae4ba63
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aae4ba63
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aae4ba63

Branch: refs/heads/master
Commit: aae4ba63ef8ab09cbd56d000dbced61e630e3a25
Parents: 376fa50
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 3 07:54:23 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 3 07:54:23 2015 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/aae4ba63/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e511c7..874099d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -202,6 +202,7 @@
  * STORM-503: Short disruptor queue wait time leads to high CPU usage when idle
  * STORM-728: Put emitted and transferred stats under correct columns
  * STORM-643: KafkaUtils repeatedly fetches messages whose offset is out of range
+ * STORM-933: NullPointerException during KafkaSpout deactivation
 
 ## 0.9.5
  * STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn