You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/31 21:19:40 UTC

logging-log4j2 git commit: "assembler" -> "builder" vernacular.

Repository: logging-log4j2
Updated Branches:
  refs/heads/LOG4J2-952 4cf3e4517 -> 728510c75


"assembler" -> "builder" vernacular.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/728510c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/728510c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/728510c7

Branch: refs/heads/LOG4J2-952
Commit: 728510c75b5d300c91e2e2e2940e889916c374ff
Parents: 4cf3e45
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 12:19:01 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 12:19:01 2015 -0700

----------------------------------------------------------------------
 .../core/config/properties/PropertiesConfigurationFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/728510c7/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
index 1c4022d..8e00002 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationFactory.java
@@ -329,7 +329,7 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
-    private void processRemainingProperties(ComponentBuilder assembler, String name, Properties properties) {
+    private void processRemainingProperties(ComponentBuilder builder, String name, Properties properties) {
         while (properties.size() > 0) {
             String propertyName = properties.stringPropertyNames().iterator().next();
 
@@ -337,9 +337,9 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
             if (index > 0) {
                 String prefix = propertyName.substring(0, index);
                 Properties componentProperties = PropertiesUtil.extractSubset(properties, prefix);
-                assembler.addComponent(createComponent(assembler, prefix, componentProperties));
+                builder.addComponent(createComponent(builder, prefix, componentProperties));
             } else  {
-                assembler.addAttribute(propertyName, properties.getProperty(propertyName));
+                builder.addAttribute(propertyName, properties.getProperty(propertyName));
                 properties.remove(propertyName);
             }
         }