This is an automated email from the ASF dual-hosted git repository.
avijayan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2791d71 HDDS-3487. Ozone start fails with NullPointerException in TLS
enabled cluster (#871)
2791d71 is described below
commit 2791d71b4cd7674ed17704cde1b296f11c478cb6
Author: avijayanhwx <[email protected]>
AuthorDate: Mon Apr 27 14:39:56 2020 -0700
HDDS-3487. Ozone start fails with NullPointerException in TLS enabled
cluster (#871)
---
.../main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java | 1 -
.../apache/hadoop/hdds/utils/LegacyHadoopConfigurationSource.java | 6 ++++++
.../main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java | 6 ++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index c15f06a..65c2802 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -262,5 +262,4 @@ public class OzoneConfiguration extends Configuration
}
return configMap;
}
-
}
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LegacyHadoopConfigurationSource.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LegacyHadoopConfigurationSource.java
index badc916..44f2f9e 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LegacyHadoopConfigurationSource.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LegacyHadoopConfigurationSource.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdds.utils;
+import java.io.IOException;
import java.util.Collection;
import org.apache.hadoop.conf.Configuration;
@@ -40,6 +41,11 @@ public class LegacyHadoopConfigurationSource implements
ConfigurationSource {
}
@Override
+ public char[] getPassword(String key) throws IOException {
+ return configuration.getPassword(key);
+ }
+
+ @Override
public Collection<String> getConfigKeys() {
return configuration.getPropsWithPrefix("").keySet();
}
diff --git
a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
index bc20f68..85d2b0b 100644
---
a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
+++
b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
@@ -35,6 +35,8 @@ public interface ConfigurationSource {
Collection<String> getConfigKeys();
+ char[] getPassword(String key) throws IOException;
+
@Deprecated
//TODO: user read only configs and don't use it to store actual port
// numbers.
@@ -108,10 +110,6 @@ public interface ConfigurationSource {
return valueString.trim().split("\\s*[,\n]\\s*");
}
- default char[] getPassword(String key) throws IOException {
- return get(key).toCharArray();
- }
-
default Map<String, String> getPropsWithPrefix(String confPrefix) {
Map<String, String> configMap = new HashMap<>();
for (String name : getConfigKeys()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
