Repository: logging-log4j2 Updated Branches: refs/heads/master 070c25eaf -> 96327da7d
Revert change that broke the build. Comments don't identify why it was made Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/96327da7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/96327da7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/96327da7 Branch: refs/heads/master Commit: 96327da7d871ef82bf1605bf4c79a4c19451ac23 Parents: 070c25e Author: Ralph Goers <[email protected]> Authored: Sat Jun 27 09:19:06 2015 -0700 Committer: Ralph Goers <[email protected]> Committed: Sat Jun 27 09:19:06 2015 -0700 ---------------------------------------------------------------------- .../log4j/core/config/plugins/convert/TypeConverterRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/96327da7/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java index 12d364f..d6e0670 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java @@ -96,7 +96,8 @@ public class TypeConverterRegistry { if (TypeUtil.isAssignable(type, key)) { LOGGER.debug("Found compatible TypeConverter<{}> for type [{}].", key, type); final TypeConverter<?> value = entry.getValue(); - return registry.putIfAbsent(type, value); + registry.putIfAbsent(type, value); + return value; } } throw new UnknownFormatConversionException(type.toString());
