This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new f781fc5 #335 Remove redundant resolvability check.
f781fc5 is described below
commit f781fc5a6e0e050da923f3c458218e2eb368c615
Author: Volkan Yazıcı <volkan.yaz...@gmail.com>
AuthorDate: Thu Jun 11 10:12:43 2020 +0200
#335 Remove redundant resolvability check.
---
.../json/template/resolver/TemplateResolvers.java | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git
a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java
b/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java
index 8bb11d6..a4b1165 100644
---
a/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java
+++
b/log4j-layout-json-template/src/main/java/org/apache/logging/log4j/layout/json/template/resolver/TemplateResolvers.java
@@ -263,22 +263,11 @@ public enum TemplateResolvers {;
return new TemplateResolver<V>() {
- /**
- * The parent resolver checking if each child is resolvable.
- *
- * This is an optimization to skip the rendering of a parent if all
- * its children are not resolvable.
- */
@Override
public boolean isResolvable() {
- for (int fieldIndex = 0; fieldIndex < fieldCount;
fieldIndex++) {
- final TemplateResolver<V> fieldResolver =
fieldResolvers.get(fieldIndex);
- final boolean resolvable = fieldResolver.isResolvable();
- if (resolvable) {
- return true;
- }
- }
- return false;
+ // We have already excluded unresolvable ones while collecting
+ // the resolvers. Hence it is safe to return true here.
+ return true;
}
/**
