You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/15 18:44:42 UTC

[09/30] storm git commit: fixed a potential NPE

fixed a potential NPE


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

Branch: refs/heads/master
Commit: 3fc80c4b0bfc83d2534fab160c72894af044dbc3
Parents: e5564c0
Author: 卫乐 <we...@taobao.com>
Authored: Thu Feb 25 15:25:58 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Thu Feb 25 15:25:58 2016 +0800

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3fc80c4b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
index c06d7db..75ec292 100644
--- a/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
+++ b/storm-core/src/jvm/org/apache/storm/stats/StatsUtil.java
@@ -1156,6 +1156,9 @@ public class StatsUtil {
     public static List extractDataFromHb(Map executor2hostPort, Map task2component, Map beats,
                                          boolean includeSys, StormTopology topology, String compId) {
         List ret = new ArrayList();
+        if (executor2hostPort == null) {
+            return ret;
+        }
         for (Object o : executor2hostPort.entrySet()) {
             Map.Entry entry = (Map.Entry) o;
             List key = (List) entry.getKey();