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 2018/05/14 04:37:20 UTC
[1/2] storm git commit: STORM-2988 Error on initialization of server
mk-worker
Repository: storm
Updated Branches:
refs/heads/1.x-branch 9bb6ad56b -> d1cc25c3c
STORM-2988 Error on initialization of server mk-worker
This closes #2665
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c26e4ad6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c26e4ad6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c26e4ad6
Branch: refs/heads/1.x-branch
Commit: c26e4ad6bb45c7fc3ff7fd9ec4f86df86c2e8c71
Parents: 9bb6ad5
Author: Artem Ervits <ge...@gmail.com>
Authored: Mon May 7 17:31:01 2018 -0400
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 14 13:37:01 2018 +0900
----------------------------------------------------------------------
.../jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c26e4ad6/storm-core/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
index 325ab1d..a012f0c 100644
--- a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
+++ b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java
@@ -67,7 +67,7 @@ public class JmxStormReporter implements StormReporter {
}
public static String getMetricsJMXDomain(Map reporterConf) {
- return Utils.getString(reporterConf, JMX_DOMAIN);
+ return Utils.getString(reporterConf.get(JMX_DOMAIN), null);
}
@Override
[2/2] storm git commit: Merge branch 'STORM-2988-1.x-merge' into
1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2988-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d1cc25c3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d1cc25c3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d1cc25c3
Branch: refs/heads/1.x-branch
Commit: d1cc25c3ca3c11fc83e0533bd1f776cd830202d0
Parents: 9bb6ad5 c26e4ad
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon May 14 13:37:14 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon May 14 13:37:14 2018 +0900
----------------------------------------------------------------------
.../jvm/org/apache/storm/metrics2/reporters/JmxStormReporter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------