Add final modifier to private fields. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4bedbb8b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4bedbb8b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4bedbb8b
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 4bedbb8beef0cf49f661278757175fd788456cdf Parents: 96e12ab Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Sep 6 17:46:01 2016 -0400 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Sep 6 17:46:01 2016 -0400 ---------------------------------------------------------------------- .../apache/logging/log4j/core/config/AbstractConfiguration.java | 2 +- .../apache/logging/log4j/core/appender/SocketAppenderTest.java | 4 ++-- .../log4j/core/appender/rolling/RollingAppenderSizeTest.java | 2 +- .../core/appender/rolling/RollingAppenderUncompressedTest.java | 2 +- .../log4j/core/appender/routing/JsonRoutingAppender2Test.java | 2 +- .../log4j/core/appender/routing/JsonRoutingAppenderTest.java | 2 +- .../core/appender/routing/PropertiesRoutingAppenderTest.java | 2 +- .../logging/log4j/core/appender/routing/RoutingAppenderTest.java | 2 +- .../core/appender/routing/RoutingAppenderWithPurgingTest.java | 2 +- .../log4j/core/appender/routing/RoutingDefaultAppenderTest.java | 2 +- .../core/config/plugins/util/ResolverUtilCustomProtocolTest.java | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java index 7a13bac..8b656a6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java @@ -125,7 +125,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement private final WatchManager watchManager = new WatchManager(configurationScheduler); private AsyncLoggerConfigDisruptor asyncLoggerConfigDisruptor; private NanoClock nanoClock = new DummyNanoClock(); - private WeakReference<LoggerContext> loggerContext; + private final WeakReference<LoggerContext> loggerContext; /** * Constructor. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java index 5175cfe..231da77 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java @@ -66,8 +66,8 @@ public class SocketAppenderTest { private static TcpSocketTestServer tcpServer; private static UdpSocketTestServer udpServer; - private LoggerContext context = LoggerContext.getContext(); - private Logger logger = context.getLogger(SocketAppenderTest.class.getName()); + private final LoggerContext context = LoggerContext.getContext(); + private final Logger logger = context.getLogger(SocketAppenderTest.class.getName()); @BeforeClass public static void setupClass() throws Exception { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/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 6e73ab3..f22dfcb 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 @@ -89,7 +89,7 @@ public class RollingAppenderSizeTest { // @formatter:on } - private LoggerContextRule loggerContextRule; + private final LoggerContextRule loggerContextRule; public RollingAppenderSizeTest(final String configFile, final String fileExtension, final boolean createOnDemand) { this.fileExtension = fileExtension; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java index e41741f..730e1b2 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java @@ -40,7 +40,7 @@ public class RollingAppenderUncompressedTest { private static final String CONFIG = "log4j-rolling4.xml"; private static final String DIR = "target/rolling4"; - private Logger logger = LogManager.getLogger(RollingAppenderUncompressedTest.class.getName()); + private final Logger logger = LogManager.getLogger(RollingAppenderUncompressedTest.class.getName()); @ClassRule public static CleanFolders rule = new CleanFolders(CONFIG); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java index 328ed4b..d749fdd 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java @@ -37,7 +37,7 @@ public class JsonRoutingAppender2Test { private static final String CONFIG = "log4j-routing2.json"; private static final String LOG_FILENAME = "target/rolling1/rollingtest-Unknown.log"; - private LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); + private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); @Rule public RuleChain rules = loggerContextRule.withCleanFilesRule(LOG_FILENAME); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java index 50b1336..93ed334 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java @@ -37,7 +37,7 @@ public class JsonRoutingAppenderTest { private static final String CONFIG = "log4j-routing.json"; private static final String LOG_FILENAME = "target/rolling1/rollingtest-Unknown.log"; - private LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); + private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); @Rule public RuleChain rules = loggerContextRule.withCleanFilesRule(LOG_FILENAME); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java index ac0c152..30c3e8d 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java @@ -44,7 +44,7 @@ public class PropertiesRoutingAppenderTest { private ListAppender app; - private LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); + private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); @Rule public RuleChain rules = loggerContextRule.withCleanFilesRule(UNKNOWN_LOG_FILE, ALERT_LOG_FILE, ACTIVITY_LOG_FILE); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java index cd28c21..03ec829 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java @@ -43,7 +43,7 @@ public class RoutingAppenderTest { private ListAppender app; - private LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); + private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); @Rule public RuleChain rules = loggerContextRule.withCleanFilesRule(UNKNOWN_LOG_FILE, ALERT_LOG_FILE, ACTIVITY_LOG_FILE); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java index 9fc4005..de07b51 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java @@ -52,7 +52,7 @@ public class RoutingAppenderWithPurgingTest { private RoutingAppender routingAppenderIdleWithHangingAppender; private RoutingAppender routingAppenderManual; - private LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); + private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG); @Rule public RuleChain chain = loggerContextRule.withCleanFilesRule(IDLE_LOG_FILE1, IDLE_LOG_FILE2, IDLE_LOG_FILE3, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java index caf2cde..eba48d9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java @@ -41,7 +41,7 @@ public class RoutingDefaultAppenderTest { private ListAppender app; - private LoggerContextRule loggerContextRule = new LoggerContextRule("log4j-routing3.xml"); + private final LoggerContextRule loggerContextRule = new LoggerContextRule("log4j-routing3.xml"); @Rule public RuleChain rules = loggerContextRule.withCleanFilesRule(LOG_FILE); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4bedbb8b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java index 2a977a9..4bd1af9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java @@ -76,7 +76,7 @@ public class ResolverUtilCustomProtocolTest { } static class SingleURLClassLoader extends ClassLoader { - private URL url; + private final URL url; public SingleURLClassLoader(URL url) { this.url = url;
