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:31:02 UTC
[1/2] storm git commit: STORM-2900 Always return non null collection
for config keys in AbstractAutoCreds.
Repository: storm
Updated Branches:
refs/heads/1.x-branch e773a43df -> e354ea86f
STORM-2900 Always return non null collection for config keys in AbstractAutoCreds.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc7c1ef5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc7c1ef5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc7c1ef5
Branch: refs/heads/1.x-branch
Commit: fc7c1ef5f9a20b631dea8a9d04c5244a61ead310
Parents: e773a43
Author: Satish Duggana <sa...@apache.org>
Authored: Thu Jan 18 09:16:28 2018 +0530
Committer: Satish Duggana <sa...@apache.org>
Committed: Thu Jan 18 09:16:28 2018 +0530
----------------------------------------------------------------------
.../main/java/org/apache/storm/common/AbstractAutoCreds.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fc7c1ef5/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
----------------------------------------------------------------------
diff --git a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
index 77b137f..551f6b3 100644
--- a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
+++ b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
@@ -39,6 +39,7 @@ import java.io.ObjectInputStream;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -249,10 +250,12 @@ public abstract class AbstractAutoCreds implements IAutoCredentials, ICredential
private List<String> loadConfigKeys(Map conf) {
List<String> keys;
- String configKeyString = getConfigKeyString();
- if ((keys = (List<String>) conf.get(configKeyString)) != null) {
+ if ((keys = (List<String>) conf.get(getConfigKeyString())) != null) {
configKeys.addAll(keys);
+ } else {
+ keys = Collections.emptyList();
}
+
return keys;
}
[2/2] storm git commit: Merge branch 'STORM-2900-1.x' of
https://github.com/satishd/storm into STORM-2900-1.x
Posted by ar...@apache.org.
Merge branch 'STORM-2900-1.x' of https://github.com/satishd/storm into STORM-2900-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e354ea86
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e354ea86
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e354ea86
Branch: refs/heads/1.x-branch
Commit: e354ea86f2d72c35bba6ea5f6b4b3b81ce4a58a3
Parents: e773a43 fc7c1ef
Author: Arun Mahadevan <ar...@apache.org>
Authored: Thu Jan 18 13:29:43 2018 -0800
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Thu Jan 18 13:29:43 2018 -0800
----------------------------------------------------------------------
.../main/java/org/apache/storm/common/AbstractAutoCreds.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------