Repository: logging-log4j2
Updated Branches:
  refs/heads/master f739a5a57 -> ed0c5e86f


Better ivar name.

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

Branch: refs/heads/master
Commit: ed0c5e86fb488d537f29f9aac144935aca0a9776
Parents: f739a5a
Author: Gary Gregory <[email protected]>
Authored: Sat Nov 12 00:43:41 2016 -0800
Committer: Gary Gregory <[email protected]>
Committed: Sat Nov 12 00:43:41 2016 -0800

----------------------------------------------------------------------
 .../logging/log4j/core/layout/ScriptPatternSelector.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ed0c5e86/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
index 95dfee6..e0b7d5e 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
@@ -65,7 +65,7 @@ public class ScriptPatternSelector implements PatternSelector 
{
         private boolean noConsoleNoAnsi;
         
         @PluginConfiguration 
-        private Configuration config;
+        private Configuration configuration;
 
         private Builder() {
             // nothing
@@ -78,7 +78,7 @@ public class ScriptPatternSelector implements PatternSelector 
{
                 return null;
             }
             if (script instanceof ScriptRef) {
-                if (config.getScriptManager().getScript(script.getName()) == 
null) {
+                if 
(configuration.getScriptManager().getScript(script.getName()) == null) {
                     LOGGER.error("No script with name {} has been declared.", 
script.getName());
                     return null;
                 }
@@ -90,7 +90,7 @@ public class ScriptPatternSelector implements PatternSelector 
{
                 LOGGER.warn("No marker patterns were provided");
                 return null;
             }
-            return new ScriptPatternSelector(script, properties, 
defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi, config);
+            return new ScriptPatternSelector(script, properties, 
defaultPattern, alwaysWriteExceptions, noConsoleNoAnsi, configuration);
         }
 
         public Builder withScript(final AbstractScript script) {
@@ -119,7 +119,7 @@ public class ScriptPatternSelector implements 
PatternSelector {
         }
 
         public Builder withConfiguration(final Configuration config) {
-            this.config = config;
+            this.configuration = config;
             return this;
         }
     }

Reply via email to