Repository: hadoop Updated Branches: refs/heads/trunk 654372db8 -> a9f07e0d3
HDFS-11665. HttpFSServerWebServer$deprecateEnv may leak secret. Contributed by John Zhuge. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ca2488c0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ca2488c0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ca2488c0 Branch: refs/heads/trunk Commit: ca2488c009b42fd45531af60b70872e4323de20b Parents: 654372d Author: John Zhuge <[email protected]> Authored: Mon Apr 17 22:36:20 2017 -0700 Committer: John Zhuge <[email protected]> Committed: Tue Apr 18 09:28:52 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/fs/http/server/HttpFSServerWebServer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ca2488c0/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java index 7bda965..6bd0d12 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java @@ -123,10 +123,9 @@ public class HttpFSServerWebServer { if (value == null) { return; } - String propValue = conf.get(propName); - LOG.warn("Environment variable {} = '{}' is deprecated and overriding" - + " property {} = '{}', please set the property in {} instead.", - varName, value, propName, propValue, confFile); + LOG.warn("Environment variable {} is deprecated and overriding" + + " property {}', please set the property in {} instead.", + varName, propName, confFile); conf.set(propName, value, "environment variable " + varName); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
