This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch release-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit afdf3cd21b1200b24750ed62846c9b7df2e44274 Author: Gary Gregory <[email protected]> AuthorDate: Tue Feb 23 15:19:24 2021 -0500 Pull down common code. --- .../org/apache/logging/log4j/core/config/Configurator.java | 11 ++++++----- .../org/apache/logging/log4j/couchdb/CouchDbProvider.java | 11 ++++++----- .../org/apache/logging/log4j/mongodb3/MongoDbProvider.java | 13 +++++++------ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java index a83bd73..f4b2966 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java @@ -46,12 +46,13 @@ public final class Configurator { final LoggerContextFactory factory = LogManager.getFactory(); if (factory instanceof Log4jContextFactory) { return (Log4jContextFactory) factory; - } else if (factory != null) { - LOGGER.error("LogManager returned an instance of {} which does not implement {}. Unable to initialize Log4j.", - factory.getClass().getName(), Log4jContextFactory.class.getName()); - return null; } else { - LOGGER.fatal("LogManager did not return a LoggerContextFactory. This indicates something has gone terribly wrong!"); + if (factory != null) { + LOGGER.error("LogManager returned an instance of {} which does not implement {}. Unable to initialize Log4j.", + factory.getClass().getName(), Log4jContextFactory.class.getName()); + } else { + LOGGER.fatal("LogManager did not return a LoggerContextFactory. This indicates something has gone terribly wrong!"); + } return null; } } diff --git a/log4j-couchdb/src/main/java/org/apache/logging/log4j/couchdb/CouchDbProvider.java b/log4j-couchdb/src/main/java/org/apache/logging/log4j/couchdb/CouchDbProvider.java index 2b233a8..942b292 100644 --- a/log4j-couchdb/src/main/java/org/apache/logging/log4j/couchdb/CouchDbProvider.java +++ b/log4j-couchdb/src/main/java/org/apache/logging/log4j/couchdb/CouchDbProvider.java @@ -109,12 +109,13 @@ public final class CouchDbProvider implements NoSqlProvider<CouchDbConnection> { + ", passwordHash=" + NameUtil.md5(password + CouchDbProvider.class.getName()) + ", maxConnections=" + properties.getMaxConnections() + ", connectionTimeout=" + properties.getConnectionTimeout() + ", socketTimeout=" + properties.getSocketTimeout(); - } else if (object == null) { - LOGGER.error("The factory method [{}.{}()] returned null.", factoryClassName, factoryMethodName); - return null; } else { - LOGGER.error("The factory method [{}.{}()] returned an unsupported type [{}].", factoryClassName, - factoryMethodName, object.getClass().getName()); + if (object == null) { + LOGGER.error("The factory method [{}.{}()] returned null.", factoryClassName, factoryMethodName); + } else { + LOGGER.error("The factory method [{}.{}()] returned an unsupported type [{}].", factoryClassName, + factoryMethodName, object.getClass().getName()); + } return null; } } catch (final ClassNotFoundException e) { diff --git a/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java index b2f5a77..05ff99d 100644 --- a/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java +++ b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java @@ -149,13 +149,14 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { + "required.", factoryClassName, factoryMethodName); return null; } - } else if (object == null) { - LOGGER.error("The factory method [{}.{}()] returned null.", factoryClassName, - factoryMethodName); - return null; } else { - LOGGER.error("The factory method [{}.{}()] returned an unsupported type [{}].", - factoryClassName, factoryMethodName, object.getClass().getName()); + if (object == null) { + LOGGER.error("The factory method [{}.{}()] returned null.", factoryClassName, + factoryMethodName); + } else { + LOGGER.error("The factory method [{}.{}()] returned an unsupported type [{}].", + factoryClassName, factoryMethodName, object.getClass().getName()); + } return null; }
