logging-log4j2 git commit: Better ivar name.

2016-11-12 Thread ggregory 
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 
Authored: Sat Nov 12 00:43:41 2016 -0800
Committer: Gary Gregory 
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;
 }
 }

logging-log4j2 git commit: Better ivar name.

2016-09-20 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 961655bbe -> b0fa1c19f


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/b0fa1c19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b0fa1c19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b0fa1c19

Branch: refs/heads/master
Commit: b0fa1c19f5044661fcbd17c0f10b7606e406
Parents: 961655b
Author: Gary Gregory 
Authored: Tue Sep 20 16:22:36 2016 -0700
Committer: Gary Gregory 
Committed: Tue Sep 20 16:22:36 2016 -0700

--
 .../logging/log4j/core/impl/Log4jLogEvent.java  | 22 ++--
 1 file changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0fa1c19/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index 146ce23..f7a1749 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -85,7 +85,7 @@ public class Log4jLogEvent implements LogEvent {
 private Throwable thrown;
 private long timeMillis = CLOCK.currentTimeMillis();
 private ThrowableProxy thrownProxy;
-private MutableContextData contextData = 
createContextData((List) null);
+private MutableContextData mutableContextData = 
createContextData((List) null);
 private ThreadContext.ContextStack contextStack = 
ThreadContext.getImmutableStack();
 private long threadId;
 private String threadName;
@@ -123,7 +123,7 @@ public class Log4jLogEvent implements LogEvent {
 // Avoid unnecessarily initializing thrownProxy, threadName and 
source if possible
 if (other instanceof Log4jLogEvent) {
 final Log4jLogEvent evt = (Log4jLogEvent) other;
-this.contextData = evt.mutableContextData;
+this.mutableContextData = evt.mutableContextData;
 this.thrownProxy = evt.thrownProxy;
 this.source = evt.source;
 this.threadId = evt.threadId;
@@ -131,14 +131,14 @@ public class Log4jLogEvent implements LogEvent {
 this.threadPriority = evt.threadPriority;
 } else {
 if (other.getContextData() instanceof MutableContextData) {
-this.contextData = (MutableContextData) 
other.getContextData();
+this.mutableContextData = (MutableContextData) 
other.getContextData();
 } else {
-if (this.contextData.isFrozen()) {
-this.contextData = 
ContextDataFactory.createContextData();
+if (this.mutableContextData.isFrozen()) {
+this.mutableContextData = 
ContextDataFactory.createContextData();
 } else {
-this.contextData.clear();
+this.mutableContextData.clear();
 }
-this.contextData.putAll(other.getContextData());
+this.mutableContextData.putAll(other.getContextData());
 
 }
 this.thrownProxy = other.getThrownProxy();
@@ -191,17 +191,17 @@ public class Log4jLogEvent implements LogEvent {
 
 @Deprecated
 public Builder setContextMap(final Map contextMap) {
-contextData = ContextDataFactory.createContextData(); // replace 
with new instance
+mutableContextData = ContextDataFactory.createContextData(); // 
replace with new instance
 if (contextMap != null) {
 for (final Map.Entry entry : 
contextMap.entrySet()) {
-contextData.putValue(entry.getKey(), entry.getValue());
+mutableContextData.putValue(entry.getKey(), 
entry.getValue());
 }
 }
 return this;
 }
 
 public Builder setContextData(final MutableContextData contextData) {
-this.contextData = contextData;
+this.mutableContextData = contextData;
 return this;
 }
 
@@ -254,7 +254,7 @@ public class Log4jLogEvent implements LogEvent {
 @Override
 public Log4jLogEvent build() {
 final Log4jLogEvent result = new Log4jLogEvent(loggerName, marker, 
loggerFqcn, level, message, thrown,
-thrownProxy, contextData, contextStack, threadId, 
threadName, threadPriority, source, timeMillis,
+

logging-log4j2 git commit: Better ivar name.

2016-09-20 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 44fb72b24 -> 9c3464681


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/9c346468
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9c346468
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9c346468

Branch: refs/heads/master
Commit: 9c34646818f41922039c551cd49b00317106d153
Parents: 44fb72b
Author: Gary Gregory 
Authored: Tue Sep 20 16:20:55 2016 -0700
Committer: Gary Gregory 
Committed: Tue Sep 20 16:20:55 2016 -0700

--
 .../logging/log4j/core/impl/Log4jLogEvent.java  | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c346468/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index af18b64..f6b87df 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -63,7 +63,7 @@ public class Log4jLogEvent implements LogEvent {
 private final long timeMillis;
 private final transient Throwable thrown;
 private ThrowableProxy thrownProxy;
-private final MutableContextData contextData;
+private final MutableContextData mutableContextData;
 private final ThreadContext.ContextStack contextStack;
 private long threadId;
 private String threadName;
@@ -123,7 +123,7 @@ public class Log4jLogEvent implements LogEvent {
 // Avoid unnecessarily initializing thrownProxy, threadName and 
source if possible
 if (other instanceof Log4jLogEvent) {
 final Log4jLogEvent evt = (Log4jLogEvent) other;
-this.contextData = evt.contextData;
+this.contextData = evt.mutableContextData;
 this.thrownProxy = evt.thrownProxy;
 this.source = evt.source;
 this.threadId = evt.threadId;
@@ -410,7 +410,7 @@ public class Log4jLogEvent implements LogEvent {
 this.message = message;
 this.thrown = thrown;
 this.thrownProxy = thrownProxy;
-this.contextData = contextData == null ? 
ContextDataFactory.createContextData() : contextData;
+this.mutableContextData = contextData == null ? 
ContextDataFactory.createContextData() : contextData;
 this.contextStack = contextStack == null ? ThreadContext.EMPTY_STACK : 
contextStack;
 this.timeMillis = message instanceof TimestampMessage
 ? ((TimestampMessage) message).getTimestamp()
@@ -584,7 +584,7 @@ public class Log4jLogEvent implements LogEvent {
  */
 @Override
 public ContextData getContextData() {
-return contextData;
+return mutableContextData;
 }
 /**
  * Returns the immutable copy of the ThreadContext Map.
@@ -592,7 +592,7 @@ public class Log4jLogEvent implements LogEvent {
  */
 @Override
 public Map getContextMap() {
-return contextData.toMap();
+return mutableContextData.toMap();
 }
 
 /**
@@ -781,7 +781,7 @@ public class Log4jLogEvent implements LogEvent {
 if (marker != null ? !marker.equals(that.marker) : that.marker != 
null) {
 return false;
 }
-if (contextData != null ? !contextData.equals(that.contextData) : 
that.contextData != null) {
+if (mutableContextData != null ? 
!mutableContextData.equals(that.mutableContextData) : that.mutableContextData 
!= null) {
 return false;
 }
 if (!message.equals(that.message)) {
@@ -824,7 +824,7 @@ public class Log4jLogEvent implements LogEvent {
 result = 31 * result + (int) (nanoTime ^ (nanoTime >>> 32));
 result = 31 * result + (thrown != null ? thrown.hashCode() : 0);
 result = 31 * result + (thrownProxy != null ? thrownProxy.hashCode() : 
0);
-result = 31 * result + (contextData != null ? contextData.hashCode() : 
0);
+result = 31 * result + (mutableContextData != null ? 
mutableContextData.hashCode() : 0);
 result = 31 * result + (contextStack != null ? contextStack.hashCode() 
: 0);
 result = 31 * result + (int) (threadId ^ (threadId >>> 32));
 result = 31 * result + (threadName != null ? threadName.hashCode() : 
0);
@@ -875,7 +875,7 @@ public class Log4jLogEvent implements LogEvent {
 this.timeMillis = event.timeMillis;
 this.thrown = event.thrown;
 this.thrownProxy = event.th

[20/35] logging-log4j2 git commit: Better ivar name.

2016-09-08 Thread rpopma 
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/fe5a7165
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe5a7165
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe5a7165

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: fe5a7165088bcbc14c99c9ce0cb6269e1ab12234
Parents: 1e93af8
Author: Gary Gregory 
Authored: Thu Sep 8 00:22:57 2016 -0700
Committer: Gary Gregory 
Committed: Thu Sep 8 00:22:57 2016 -0700

--
 .../appender/rolling/CompositeTriggeringPolicy.java | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fe5a7165/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
index 607b176..d1d8c6f 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
@@ -30,14 +30,14 @@ import 
org.apache.logging.log4j.core.config.plugins.PluginFactory;
 @Plugin(name = "Policies", category = "Core", printObject = true)
 public final class CompositeTriggeringPolicy extends AbstractTriggeringPolicy {
 
-private final TriggeringPolicy[] triggeringPolicy;
+private final TriggeringPolicy[] triggeringPolicies;
 
-private CompositeTriggeringPolicy(final TriggeringPolicy... policies) {
-this.triggeringPolicy = policies;
+private CompositeTriggeringPolicy(final TriggeringPolicy... 
triggeringPolicies) {
+this.triggeringPolicies = triggeringPolicies;
 }
 
 public TriggeringPolicy[] getTriggeringPolicies() {
-return triggeringPolicy;
+return triggeringPolicies;
 }
 
 /**
@@ -46,7 +46,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
  */
 @Override
 public void initialize(final RollingFileManager manager) {
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 policy.initialize(manager);
 }
 }
@@ -58,7 +58,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
  */
 @Override
 public boolean isTriggeringEvent(final LogEvent event) {
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 if (policy.isTriggeringEvent(event)) {
 return true;
 }
@@ -80,7 +80,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
 @Override
 public boolean stop(final long timeout, final TimeUnit timeUnit) {
 boolean stopped = true;
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 stopped &= policy.stop(timeout, timeUnit);
 }
 return stopped;
@@ -88,7 +88,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
 
 @Override
 public String toString() {
-return "CompositeTriggeringPolicy(policies=" + 
Arrays.toString(triggeringPolicy) + ")";
+return "CompositeTriggeringPolicy(policies=" + 
Arrays.toString(triggeringPolicies) + ")";
 }
 
 }

logging-log4j2 git commit: Better ivar name.

2016-09-08 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 1e93af866 -> fe5a71650


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/fe5a7165
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe5a7165
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe5a7165

Branch: refs/heads/master
Commit: fe5a7165088bcbc14c99c9ce0cb6269e1ab12234
Parents: 1e93af8
Author: Gary Gregory 
Authored: Thu Sep 8 00:22:57 2016 -0700
Committer: Gary Gregory 
Committed: Thu Sep 8 00:22:57 2016 -0700

--
 .../appender/rolling/CompositeTriggeringPolicy.java | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fe5a7165/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
index 607b176..d1d8c6f 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
@@ -30,14 +30,14 @@ import 
org.apache.logging.log4j.core.config.plugins.PluginFactory;
 @Plugin(name = "Policies", category = "Core", printObject = true)
 public final class CompositeTriggeringPolicy extends AbstractTriggeringPolicy {
 
-private final TriggeringPolicy[] triggeringPolicy;
+private final TriggeringPolicy[] triggeringPolicies;
 
-private CompositeTriggeringPolicy(final TriggeringPolicy... policies) {
-this.triggeringPolicy = policies;
+private CompositeTriggeringPolicy(final TriggeringPolicy... 
triggeringPolicies) {
+this.triggeringPolicies = triggeringPolicies;
 }
 
 public TriggeringPolicy[] getTriggeringPolicies() {
-return triggeringPolicy;
+return triggeringPolicies;
 }
 
 /**
@@ -46,7 +46,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
  */
 @Override
 public void initialize(final RollingFileManager manager) {
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 policy.initialize(manager);
 }
 }
@@ -58,7 +58,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
  */
 @Override
 public boolean isTriggeringEvent(final LogEvent event) {
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 if (policy.isTriggeringEvent(event)) {
 return true;
 }
@@ -80,7 +80,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
 @Override
 public boolean stop(final long timeout, final TimeUnit timeUnit) {
 boolean stopped = true;
-for (final TriggeringPolicy policy : triggeringPolicy) {
+for (final TriggeringPolicy policy : triggeringPolicies) {
 stopped &= policy.stop(timeout, timeUnit);
 }
 return stopped;
@@ -88,7 +88,7 @@ public final class CompositeTriggeringPolicy extends 
AbstractTriggeringPolicy {
 
 @Override
 public String toString() {
-return "CompositeTriggeringPolicy(policies=" + 
Arrays.toString(triggeringPolicy) + ")";
+return "CompositeTriggeringPolicy(policies=" + 
Arrays.toString(triggeringPolicies) + ")";
 }
 
 }

[20/39] logging-log4j2 git commit: Better ivar name.

2016-06-26 Thread mikes 
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/dbc770dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dbc770dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dbc770dd

Branch: refs/heads/LOG4J-1181
Commit: dbc770dd4cf7fffc36f72143995a3bc9cd00e706
Parents: 8494e1d
Author: Gary Gregory 
Authored: Thu Jun 23 17:37:52 2016 -0700
Committer: Gary Gregory 
Committed: Thu Jun 23 17:37:52 2016 -0700

--
 .../log4j/core/appender/rolling/RollingAppenderSizeTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dbc770dd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
index 2229531..94d9571 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
@@ -76,11 +76,11 @@ public class RollingAppenderSizeTest {
 }
 
 @Rule
-public LoggerContextRule init;
+public LoggerContextRule loggerContextRule;
 
 public RollingAppenderSizeTest(final String configFile, final String 
fileExtension) {
 this.fileExtension = fileExtension;
-this.init = new LoggerContextRule(configFile);
+this.loggerContextRule = new LoggerContextRule(configFile);
 }
 
 @BeforeClass
@@ -95,7 +95,7 @@ public class RollingAppenderSizeTest {
 
 @Before
 public void setUp() throws Exception {
-this.logger = 
this.init.getLogger(RollingAppenderSizeTest.class.getName());
+this.logger = 
this.loggerContextRule.getLogger(RollingAppenderSizeTest.class.getName());
 }
 
 @Test

logging-log4j2 git commit: Better ivar name.

2016-06-23 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 8494e1d93 -> dbc770dd4


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/dbc770dd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dbc770dd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dbc770dd

Branch: refs/heads/master
Commit: dbc770dd4cf7fffc36f72143995a3bc9cd00e706
Parents: 8494e1d
Author: Gary Gregory 
Authored: Thu Jun 23 17:37:52 2016 -0700
Committer: Gary Gregory 
Committed: Thu Jun 23 17:37:52 2016 -0700

--
 .../log4j/core/appender/rolling/RollingAppenderSizeTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dbc770dd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
index 2229531..94d9571 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
@@ -76,11 +76,11 @@ public class RollingAppenderSizeTest {
 }
 
 @Rule
-public LoggerContextRule init;
+public LoggerContextRule loggerContextRule;
 
 public RollingAppenderSizeTest(final String configFile, final String 
fileExtension) {
 this.fileExtension = fileExtension;
-this.init = new LoggerContextRule(configFile);
+this.loggerContextRule = new LoggerContextRule(configFile);
 }
 
 @BeforeClass
@@ -95,7 +95,7 @@ public class RollingAppenderSizeTest {
 
 @Before
 public void setUp() throws Exception {
-this.logger = 
this.init.getLogger(RollingAppenderSizeTest.class.getName());
+this.logger = 
this.loggerContextRule.getLogger(RollingAppenderSizeTest.class.getName());
 }
 
 @Test

[36/41] logging-log4j2 git commit: Better ivar name.

2016-03-22 Thread mikes 
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/3fc4c72b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3fc4c72b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3fc4c72b

Branch: refs/heads/gelf-layout-gc-free
Commit: 3fc4c72b4bc2b2df5ed6ac9ebab89da670ad556b
Parents: 72e2e11
Author: ggregory 
Authored: Fri Mar 18 16:25:31 2016 -0700
Committer: ggregory 
Committed: Fri Mar 18 16:25:31 2016 -0700

--
 .../rolling/DefaultRolloverStrategy.java| 32 ++--
 1 file changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3fc4c72b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index c9de196..e56a39a 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -235,7 +235,7 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  */
 private final int minIndex;
 private final boolean useMax;
-private final StrSubstitutor subst;
+private final StrSubstitutor strSubstitutor;
 private final int compressionLevel;
 private final List customActions;
 
@@ -250,13 +250,13 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  * @param stopCustomActionsOnError whether to stop executing asynchronous 
actions if an error occurs
  */
 protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, 
final boolean useMax,
-final int compressionLevel, final StrSubstitutor subst, final 
Action[] customActions,
+final int compressionLevel, final StrSubstitutor strSubstitutor, 
final Action[] customActions,
 final boolean stopCustomActionsOnError) {
 this.minIndex = minIndex;
 this.maxIndex = maxIndex;
 this.useMax = useMax;
 this.compressionLevel = compressionLevel;
-this.subst = subst;
+this.strSubstitutor = strSubstitutor;
 this.stopCustomActionsOnError = stopCustomActionsOnError;
 this.customActions = customActions == null ? Collections. 
emptyList() : Arrays.asList(customActions);
 }
@@ -277,8 +277,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 return this.minIndex;
 }
 
-public StrSubstitutor getSubst() {
-return subst;
+public StrSubstitutor getStrSubstitutor() {
+return strSubstitutor;
 }
 
 public boolean isStopCustomActionsOnError() {
@@ -320,8 +320,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 final StringBuilder buf = new StringBuilder();
 
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, highIndex);
-String highFilename = subst.replace(buf);
+manager.getPatternProcessor().formatFileName(strSubstitutor, buf, 
highIndex);
+String highFilename = strSubstitutor.replace(buf);
 final int suffixLength = suffixLength(highFilename);
 int curMaxIndex = 0;
 
@@ -371,9 +371,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 // add a rename action to the list
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-final String lowFilename = subst.replace(buf);
+final String lowFilename = strSubstitutor.replace(buf);
 String renameTo = lowFilename;
 
 if (isBase) {
@@ -385,9 +385,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 } else {
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-highFilename = subst.replace(buf);
+highFilename = strSubstitutor.replace(buf);
 }
 }
 if (curMaxIndex == 0) {
@@ -427,9 +427,

[09/11] logging-log4j2 git commit: Better ivar name.

2016-03-18 Thread rpopma 
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/3fc4c72b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3fc4c72b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3fc4c72b

Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 3fc4c72b4bc2b2df5ed6ac9ebab89da670ad556b
Parents: 72e2e11
Author: ggregory 
Authored: Fri Mar 18 16:25:31 2016 -0700
Committer: ggregory 
Committed: Fri Mar 18 16:25:31 2016 -0700

--
 .../rolling/DefaultRolloverStrategy.java| 32 ++--
 1 file changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3fc4c72b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index c9de196..e56a39a 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -235,7 +235,7 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  */
 private final int minIndex;
 private final boolean useMax;
-private final StrSubstitutor subst;
+private final StrSubstitutor strSubstitutor;
 private final int compressionLevel;
 private final List customActions;
 
@@ -250,13 +250,13 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  * @param stopCustomActionsOnError whether to stop executing asynchronous 
actions if an error occurs
  */
 protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, 
final boolean useMax,
-final int compressionLevel, final StrSubstitutor subst, final 
Action[] customActions,
+final int compressionLevel, final StrSubstitutor strSubstitutor, 
final Action[] customActions,
 final boolean stopCustomActionsOnError) {
 this.minIndex = minIndex;
 this.maxIndex = maxIndex;
 this.useMax = useMax;
 this.compressionLevel = compressionLevel;
-this.subst = subst;
+this.strSubstitutor = strSubstitutor;
 this.stopCustomActionsOnError = stopCustomActionsOnError;
 this.customActions = customActions == null ? Collections. 
emptyList() : Arrays.asList(customActions);
 }
@@ -277,8 +277,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 return this.minIndex;
 }
 
-public StrSubstitutor getSubst() {
-return subst;
+public StrSubstitutor getStrSubstitutor() {
+return strSubstitutor;
 }
 
 public boolean isStopCustomActionsOnError() {
@@ -320,8 +320,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 final StringBuilder buf = new StringBuilder();
 
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, highIndex);
-String highFilename = subst.replace(buf);
+manager.getPatternProcessor().formatFileName(strSubstitutor, buf, 
highIndex);
+String highFilename = strSubstitutor.replace(buf);
 final int suffixLength = suffixLength(highFilename);
 int curMaxIndex = 0;
 
@@ -371,9 +371,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 // add a rename action to the list
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-final String lowFilename = subst.replace(buf);
+final String lowFilename = strSubstitutor.replace(buf);
 String renameTo = lowFilename;
 
 if (isBase) {
@@ -385,9 +385,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 } else {
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-highFilename = subst.replace(buf);
+highFilename = strSubstitutor.replace(buf);
 }
 }
 if (curMaxIndex == 0) {
@@ -427,

logging-log4j2 git commit: Better ivar name.

2016-03-18 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 72e2e1180 -> 3fc4c72b4


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/3fc4c72b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3fc4c72b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3fc4c72b

Branch: refs/heads/master
Commit: 3fc4c72b4bc2b2df5ed6ac9ebab89da670ad556b
Parents: 72e2e11
Author: ggregory 
Authored: Fri Mar 18 16:25:31 2016 -0700
Committer: ggregory 
Committed: Fri Mar 18 16:25:31 2016 -0700

--
 .../rolling/DefaultRolloverStrategy.java| 32 ++--
 1 file changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3fc4c72b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index c9de196..e56a39a 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -235,7 +235,7 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  */
 private final int minIndex;
 private final boolean useMax;
-private final StrSubstitutor subst;
+private final StrSubstitutor strSubstitutor;
 private final int compressionLevel;
 private final List customActions;
 
@@ -250,13 +250,13 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
  * @param stopCustomActionsOnError whether to stop executing asynchronous 
actions if an error occurs
  */
 protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, 
final boolean useMax,
-final int compressionLevel, final StrSubstitutor subst, final 
Action[] customActions,
+final int compressionLevel, final StrSubstitutor strSubstitutor, 
final Action[] customActions,
 final boolean stopCustomActionsOnError) {
 this.minIndex = minIndex;
 this.maxIndex = maxIndex;
 this.useMax = useMax;
 this.compressionLevel = compressionLevel;
-this.subst = subst;
+this.strSubstitutor = strSubstitutor;
 this.stopCustomActionsOnError = stopCustomActionsOnError;
 this.customActions = customActions == null ? Collections. 
emptyList() : Arrays.asList(customActions);
 }
@@ -277,8 +277,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 return this.minIndex;
 }
 
-public StrSubstitutor getSubst() {
-return subst;
+public StrSubstitutor getStrSubstitutor() {
+return strSubstitutor;
 }
 
 public boolean isStopCustomActionsOnError() {
@@ -320,8 +320,8 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 final StringBuilder buf = new StringBuilder();
 
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, highIndex);
-String highFilename = subst.replace(buf);
+manager.getPatternProcessor().formatFileName(strSubstitutor, buf, 
highIndex);
+String highFilename = strSubstitutor.replace(buf);
 final int suffixLength = suffixLength(highFilename);
 int curMaxIndex = 0;
 
@@ -371,9 +371,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 // add a rename action to the list
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-final String lowFilename = subst.replace(buf);
+final String lowFilename = strSubstitutor.replace(buf);
 String renameTo = lowFilename;
 
 if (isBase) {
@@ -385,9 +385,9 @@ public class DefaultRolloverStrategy implements 
RolloverStrategy {
 } else {
 buf.setLength(0);
 // LOG4J2-531: directory scan & rollover must use same format
-manager.getPatternProcessor().formatFileName(subst, buf, i - 
1);
+manager.getPatternProcessor().formatFileName(strSubstitutor, 
buf, i - 1);
 
-highFilename = subst.replace(buf);
+highFilename = strSubstitutor.replace(buf

[2/8] logging-log4j2 git commit: Better ivar name

2016-03-08 Thread mikes 
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/4cc2d12f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4cc2d12f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4cc2d12f

Branch: refs/heads/gelf-layout-gc-free
Commit: 4cc2d12f39605b528ff202cbff380a0854376716
Parents: 19e6ecd
Author: Matt Sicker 
Authored: Tue Mar 8 09:27:18 2016 -0600
Committer: Matt Sicker 
Committed: Tue Mar 8 09:27:18 2016 -0600

--
 .../src/test/java/org/apache/logging/log4j/junit/CleanFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cc2d12f/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java 
b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
index 6713aea..6c0ac76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
@@ -57,7 +57,7 @@ public class CleanFiles extends ExternalResource {
 }
 try {
 Thread.sleep(200);
-} catch (InterruptedException e) {
+} catch (InterruptedException ignored) {
 }
 }
 }

logging-log4j2 git commit: Better ivar name

2016-03-08 Thread mattsicker 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 19e6ecd25 -> 4cc2d12f3


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/4cc2d12f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4cc2d12f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4cc2d12f

Branch: refs/heads/master
Commit: 4cc2d12f39605b528ff202cbff380a0854376716
Parents: 19e6ecd
Author: Matt Sicker 
Authored: Tue Mar 8 09:27:18 2016 -0600
Committer: Matt Sicker 
Committed: Tue Mar 8 09:27:18 2016 -0600

--
 .../src/test/java/org/apache/logging/log4j/junit/CleanFiles.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cc2d12f/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java 
b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
index 6713aea..6c0ac76 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java
@@ -57,7 +57,7 @@ public class CleanFiles extends ExternalResource {
 }
 try {
 Thread.sleep(200);
-} catch (InterruptedException e) {
+} catch (InterruptedException ignored) {
 }
 }
 }

[10/45] logging-log4j2 git commit: Better ivar name and typo fix.

2015-11-02 Thread mikes 
Better ivar name and typo fix.


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

Branch: refs/heads/LOG4J-1181
Commit: 6d7adb9922f7ec3994e1cc262edc3e4326ba0951
Parents: a6c5ff2
Author: Matt Sicker 
Authored: Sat Oct 31 02:13:56 2015 -0500
Committer: Matt Sicker 
Committed: Sat Oct 31 02:13:56 2015 -0500

--
 .../main/java/org/apache/logging/log4j/util/LoaderUtil.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d7adb99/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
--
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index bf08c53..144be32 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -185,11 +185,11 @@ public final class LoaderUtil {
 public static  T newCheckedInstanceOfProperty(final String 
propertyName, final Class clazz)
 throws ClassNotFoundException, NoSuchMethodException, 
InvocationTargetException, InstantiationException,
 IllegalAccessException {
-final String property = 
PropertiesUtil.getProperties().getStringProperty(propertyName);
-if (property == null) {
+final String className = 
PropertiesUtil.getProperties().getStringProperty(propertyName);
+if (className == null) {
 return null;
 }
-return newCheckedInstanceOf(propertyName, clazz);
+return newCheckedInstanceOf(className, clazz);
 }
 
 private static boolean isIgnoreTccl() {

logging-log4j2 git commit: Better ivar name and typo fix.

2015-10-31 Thread mattsicker 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master a6c5ff217 -> 6d7adb992


Better ivar name and typo fix.


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

Branch: refs/heads/master
Commit: 6d7adb9922f7ec3994e1cc262edc3e4326ba0951
Parents: a6c5ff2
Author: Matt Sicker 
Authored: Sat Oct 31 02:13:56 2015 -0500
Committer: Matt Sicker 
Committed: Sat Oct 31 02:13:56 2015 -0500

--
 .../main/java/org/apache/logging/log4j/util/LoaderUtil.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6d7adb99/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
--
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java 
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index bf08c53..144be32 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -185,11 +185,11 @@ public final class LoaderUtil {
 public static  T newCheckedInstanceOfProperty(final String 
propertyName, final Class clazz)
 throws ClassNotFoundException, NoSuchMethodException, 
InvocationTargetException, InstantiationException,
 IllegalAccessException {
-final String property = 
PropertiesUtil.getProperties().getStringProperty(propertyName);
-if (property == null) {
+final String className = 
PropertiesUtil.getProperties().getStringProperty(propertyName);
+if (className == null) {
 return null;
 }
-return newCheckedInstanceOf(propertyName, clazz);
+return newCheckedInstanceOf(className, clazz);
 }
 
 private static boolean isIgnoreTccl() {

logging-log4j2 git commit: Better ivar name.

2015-10-26 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 6e95a72d5 -> 8e59d7c7e


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/8e59d7c7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8e59d7c7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8e59d7c7

Branch: refs/heads/master
Commit: 8e59d7c7ed825a79ed206428664a6d12e649abb9
Parents: 6e95a72
Author: ggregory 
Authored: Mon Oct 26 14:03:21 2015 -0700
Committer: ggregory 
Committed: Mon Oct 26 14:03:21 2015 -0700

--
 .../apache/logging/log4j/core/appender/ConsoleAppender.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8e59d7c7/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 61cb072..99e7133 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -320,7 +320,7 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout;
 
 /**
@@ -332,7 +332,7 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout) {
 this.os = os;
-this.type = type;
+this.name = type;
 this.layout = layout;
 }
 }
@@ -351,7 +351,7 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender

logging-log4j2 git commit: Better ivar name.

2014-11-17 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 7d6283ba6 -> 588f8eee2


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/588f8eee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/588f8eee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/588f8eee

Branch: refs/heads/master
Commit: 588f8eee239054dd492717757f6eefa23e9918fc
Parents: 7d6283b
Author: Gary Gregory 
Authored: Mon Nov 17 14:07:17 2014 -0500
Committer: Gary Gregory 
Committed: Mon Nov 17 14:07:17 2014 -0500

--
 log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/588f8eee/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
--
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java 
b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
index c061bb9..2709141 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java
@@ -34,8 +34,8 @@ public class LoggingTest {
 
 @Test
 public void testParent() {
-final Logger a = Logger.getLogger("org.apache.test.logging.Test");
-final Category parent = a.getParent();
+final Logger logger = Logger.getLogger("org.apache.test.logging.Test");
+final Category parent = logger.getParent();
 assertNotNull("No parent Logger", parent);
 assertTrue("Incorrect parent logger", 
parent.getName().equals("org.apache.test.logging"));
 }