merge from master

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

Branch: refs/heads/master
Commit: e0e9de7d01bb09e6593093cc9324b09f03abb55c
Parents: f819b49
Author: 卫乐 <[email protected]>
Authored: Fri Feb 26 14:03:35 2016 +0800
Committer: 卫乐 <[email protected]>
Committed: Fri Feb 26 14:03:35 2016 +0800

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/ui/core.clj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e0e9de7d/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj 
b/storm-core/src/clj/org/apache/storm/ui/core.clj
index d0d87b8..2df61f0 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -28,6 +28,7 @@
                                               start-metrics-reporters]]])
   (:import [org.apache.storm.utils Time]
            [org.apache.storm.generated NimbusSummary]
+           [org.apache.storm.stats StatsUtil]
            [org.apache.storm.ui UIHelpers IConfigurator FilterConfiguration])
   (:use [clojure.string :only [blank? lower-case trim split]])
   (:import [org.apache.storm.generated ExecutorSpecificStats
@@ -111,7 +112,7 @@
 
 (defn executor-summary-type
   [topology ^ExecutorSummary s]
-  (component-type topology (.get_component_id s)))
+  (StatsUtil/componentType topology (.get_component_id s)))
 
 (defn is-ack-stream
   [stream]

Reply via email to