Repository: logging-log4j2 Updated Branches: refs/heads/master 276381584 -> 1883517b7
[LOG4J2-966] KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. Also update Javadoc. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1883517b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1883517b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1883517b Branch: refs/heads/master Commit: 1883517b7e55623d8052403b6687c36120d3cb91 Parents: 2763815 Author: Gary Gregory <[email protected]> Authored: Mon Mar 2 14:50:25 2015 -0800 Committer: Gary Gregory <[email protected]> Committed: Mon Mar 2 14:50:25 2015 -0800 ---------------------------------------------------------------------- .../logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 4 ++-- src/changes/changes.xml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1883517b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java index 3906d1f..c5369ea 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java @@ -51,7 +51,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration { * @param keyStoreType * The KeyStore type, null defaults to {@code "JKS"}. * @param keyManagerFactoryAlgorithm - * TODO + * The standard name of the requested algorithm. See the Java Secure Socket Extension Reference Guide for information about these names. * @return a new KeyStoreConfiguration * @throws StoreConfigurationException */ @@ -63,7 +63,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration { @PluginAttribute("type") final String keyStoreType, @PluginAttribute("keyManagerFactoryAlgorithm") final String keyManagerFactoryAlgorithm) throws StoreConfigurationException { // @formatter:on - return new KeyStoreConfiguration(location, password, keyStoreType, null); + return new KeyStoreConfiguration(location, password, keyStoreType, keyManagerFactoryAlgorithm); } public KeyManagerFactory initKeyManagerFactory() throws NoSuchAlgorithmException, UnrecoverableKeyException, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1883517b/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e3b1833..f7b3259 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,8 +24,11 @@ </properties> <body> <release version="2.2.1" date="2015-0?-??" description="GA Release 2.2.1"> + <action issue="LOG4J2-966" dev="ggregory" type="fix" due-to="Gary Gregory"> + KeyStoreConfiguration.createKeyStoreConfiguration() ignores keyManagerFactoryAlgorithm. + </action> <action issue="LOG4J2-964" dev="ggregory" type="fix" due-to="Jonne Jyrylä"> - StringFormattedMessage serialization is incorrect. + </action> <action issue="LOG4J2-947" dev="ggregory" type="fix" due-to=" Stefan Wehner"> A new StatusLoggerAdmin listener is added to StatusLogger every time the log is reconfigured.
