Repository: logging-log4j2 Updated Branches: refs/heads/master cbbc529cc -> 7e83dfb0c
LOG4J2-2054 prevent NPE when environment variable is not defined, allowing for null passwords Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7e83dfb0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7e83dfb0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7e83dfb0 Branch: refs/heads/master Commit: 7e83dfb0c26bcbb2dcd1677f90e36f6ecc4f8c0c Parents: cbbc529 Author: rpopma <[email protected]> Authored: Wed Sep 27 00:52:36 2017 +0900 Committer: rpopma <[email protected]> Committed: Wed Sep 27 00:52:36 2017 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7e83dfb0/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java index 6545b7f..d60f82c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/EnvironmentPasswordProvider.java @@ -50,6 +50,6 @@ class EnvironmentPasswordProvider implements PasswordProvider { @Override public char[] getPassword() { String password = System.getenv(passwordEnvironmentVariable); - return password.toCharArray(); + return password == null ? null : password.toCharArray(); } }
