You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ar...@apache.org on 2018/01/18 21:10:16 UTC
[1/2] storm git commit: STORM-2900 Always return non null collection
for config keys in AbstractHadoopNimbusPluginAutoCreds.
Repository: storm
Updated Branches:
refs/heads/master ee0c36dd3 -> 3ce7ada65
STORM-2900 Always return non null collection for config keys in AbstractHadoopNimbusPluginAutoCreds.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cce4a5b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cce4a5b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cce4a5b4
Branch: refs/heads/master
Commit: cce4a5b4d9dc9715ceb632adfa93540e81d22134
Parents: ee0c36d
Author: Satish Duggana <sa...@apache.org>
Authored: Thu Jan 18 09:13:38 2018 +0530
Committer: Satish Duggana <sa...@apache.org>
Committed: Thu Jan 18 09:13:38 2018 +0530
----------------------------------------------------------------------
.../apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/cce4a5b4/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
index 6f76b9f..83e6d9b 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
import javax.xml.bind.DatatypeConverter;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -121,7 +122,8 @@ public abstract class AbstractHadoopNimbusPluginAutoCreds
protected List<String> getConfigKeys(Map conf) {
String configKeyString = getConfigKeyString();
- return (List<String>) conf.get(configKeyString);
+ List<String> configKeys = (List<String>) conf.get(configKeyString);
+ return configKeys != null ? configKeys : Collections.emptyList();
}
}
[2/2] storm git commit: Merge branch 'STORM-2900' of
https://github.com/satishd/storm into STORM-2900
Posted by ar...@apache.org.
Merge branch 'STORM-2900' of https://github.com/satishd/storm into STORM-2900
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ce7ada6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ce7ada6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ce7ada6
Branch: refs/heads/master
Commit: 3ce7ada65fe38beb6ecc6c5cffd773a2aaeaa3c8
Parents: ee0c36d cce4a5b
Author: Arun Mahadevan <ar...@apache.org>
Authored: Thu Jan 18 13:08:12 2018 -0800
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Thu Jan 18 13:08:12 2018 -0800
----------------------------------------------------------------------
.../apache/storm/common/AbstractHadoopNimbusPluginAutoCreds.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------