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 2014/06/25 06:51:02 UTC
svn commit: r1605265 [1/4] - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdb...
Author: ggregory
Date: Wed Jun 25 04:51:00 2014
New Revision: 1605265
URL: http://svn.apache.org/r1605265
Log:
Use final. Move FreePortFinder back to Flume module because there is no dependency on Core's tests.
Added:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java
- copied unchanged from r1605254, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/FreePortFinder.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReflectiveCallerClassUtility.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/InputStreamLogEventBridge.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/SecureTcpSocketServer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/FormattingInfo.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternFormatter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/StyleConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Booleans.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Integers.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/SetUtils.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/LogRolloverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerDateTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LookupTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira180Main.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira272Main.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleJira319Main.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderAnsiStyleLayoutMain.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderNoAnsiStyleLayoutMain.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ProgressConsoleTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogFrameTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderValidationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAsyncAppenderValidationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/MarkerAttributeConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManagerHeaderFooterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadNameStrategyTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ReconfigurationDeadlockTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ThrowableProxyTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429MyNamesTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/JacksonIssue429Test.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/JndiLookupTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookupTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockSyslogServerFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBsdTlsSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/StoreConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogInputStreamReaderBase.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogTestUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/LevelPatternConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowablePatternConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/FileUtilsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/AvailablePortFinder.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/SomethingThatUsesLogging.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/appender/UsesLoggingAppender.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/AbstractLogEvent.java Wed Jun 25 04:51:00 2014
@@ -108,12 +108,12 @@ public abstract class AbstractLogEvent i
}
@Override
- public void setEndOfBatch(boolean endOfBatch) {
+ public void setEndOfBatch(final boolean endOfBatch) {
// do nothing
}
@Override
- public void setIncludeLocation(boolean locationRequired) {
+ public void setIncludeLocation(final boolean locationRequired) {
// do nothing
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Wed Jun 25 04:51:00 2014
@@ -40,10 +40,10 @@ public abstract class AbstractAppender e
private final String name;
- public static int parseInt(String s, int defaultValue) {
+ public static int parseInt(final String s, final int defaultValue) {
try {
return Integers.parseInt(s, defaultValue);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
LOGGER.error("Could not parse \"{}\" as an integer, using default value {}: {}", s, defaultValue, e);
return defaultValue;
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java Wed Jun 25 04:51:00 2014
@@ -138,7 +138,7 @@ public final class AsyncAppender extends
}
logEvent = ((RingBufferLogEvent) logEvent).createMemento();
}
- Log4jLogEvent coreEvent = (Log4jLogEvent) logEvent;
+ final Log4jLogEvent coreEvent = (Log4jLogEvent) logEvent;
boolean appendSuccessful = false;
if (blocking) {
if (isAppenderThread.get() == Boolean.TRUE && queue.remainingCapacity() == 0) {
@@ -236,7 +236,7 @@ public final class AsyncAppender extends
}
final Log4jLogEvent event = Log4jLogEvent.deserialize(s);
event.setEndOfBatch(queue.isEmpty());
- boolean success = callAppenders(event);
+ final boolean success = callAppenders(event);
if (!success && errorAppender != null) {
try {
errorAppender.callAppender(event);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Wed Jun 25 04:51:00 2014
@@ -104,7 +104,7 @@ public final class FailoverAppender exte
error("FailoverAppender " + getName() + " did not start successfully");
return;
}
- long localCheckMillis = nextCheckMillis;
+ final long localCheckMillis = nextCheckMillis;
if (localCheckMillis == 0 || System.currentTimeMillis() > localCheckMillis) {
callAppender(event);
} else {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java Wed Jun 25 04:51:00 2014
@@ -35,7 +35,7 @@ public class OutputStreamManager extends
this.os = os;
this.layout = layout;
if (layout != null) {
- byte[] header = layout.getHeader();
+ final byte[] header = layout.getHeader();
if (header != null) {
try {
this.os.write(header, 0, header.length);
@@ -76,7 +76,7 @@ public class OutputStreamManager extends
if (layout == null) {
return;
}
- byte[] footer = layout.getFooter();
+ final byte[] footer = layout.getFooter();
if (footer != null) {
write(footer);
}
@@ -95,7 +95,7 @@ public class OutputStreamManager extends
}
protected void setOutputStream(final OutputStream os) {
- byte[] header = layout.getHeader();
+ final byte[] header = layout.getHeader();
if (header != null) {
try {
os.write(header, 0, header.length);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java Wed Jun 25 04:51:00 2014
@@ -45,7 +45,7 @@ public class RandomAccessFileManager ext
protected RandomAccessFileManager(final RandomAccessFile file,
final String fileName, final OutputStream os,
- final boolean immediateFlush, int bufferSize,
+ final boolean immediateFlush, final int bufferSize,
final String advertiseURI, final Layout<? extends Serializable> layout) {
super(os, fileName, layout);
this.isImmediateFlush = immediateFlush;
@@ -69,7 +69,7 @@ public class RandomAccessFileManager ext
* @return A RandomAccessFileManager for the File.
*/
public static RandomAccessFileManager getFileManager(final String fileName, final boolean append,
- final boolean isFlush, int bufferSize, final String advertiseURI,
+ final boolean isFlush, final int bufferSize, final String advertiseURI,
final Layout<? extends Serializable> layout) {
return (RandomAccessFileManager) getManager(fileName, new FactoryData(append,
isFlush, bufferSize, advertiseURI, layout), FACTORY);
@@ -186,7 +186,7 @@ public class RandomAccessFileManager ext
* @param bufferSize TODO
*/
public FactoryData(final boolean append, final boolean immediateFlush,
- int bufferSize, final String advertiseURI, final Layout<? extends Serializable> layout) {
+ final int bufferSize, final String advertiseURI, final Layout<? extends Serializable> layout) {
this.append = append;
this.immediateFlush = immediateFlush;
this.bufferSize = bufferSize;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java Wed Jun 25 04:51:00 2014
@@ -27,7 +27,7 @@ public class TlsSyslogFrame {
private String message;
private int messageLengthInBytes;
- public TlsSyslogFrame(String message) {
+ public TlsSyslogFrame(final String message) {
setMessage(message);
}
@@ -35,7 +35,7 @@ public class TlsSyslogFrame {
return this.message;
}
- public void setMessage(String message) {
+ public void setMessage(final String message) {
this.message = message;
setLengthInBytes();
}
@@ -45,30 +45,30 @@ public class TlsSyslogFrame {
}
public byte[] getBytes() {
- String frame = toString();
+ final String frame = toString();
return frame.getBytes(Charset.defaultCharset());
}
@Override
public String toString() {
- String length = Integer.toString(messageLengthInBytes);
+ final String length = Integer.toString(messageLengthInBytes);
return length + SPACE + message;
}
@Override
- public boolean equals(Object frame) {
+ public boolean equals(final Object frame) {
return super.equals(frame);
}
- public boolean equals(TlsSyslogFrame frame) {
+ public boolean equals(final TlsSyslogFrame frame) {
return isLengthEquals(frame) && isMessageEquals(frame);
}
- private boolean isLengthEquals(TlsSyslogFrame frame) {
+ private boolean isLengthEquals(final TlsSyslogFrame frame) {
return this.messageLengthInBytes == frame.messageLengthInBytes;
}
- private boolean isMessageEquals(TlsSyslogFrame frame) {
+ private boolean isMessageEquals(final TlsSyslogFrame frame) {
return this.message.equals(frame.message);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java Wed Jun 25 04:51:00 2014
@@ -70,7 +70,7 @@ public final class JdbcDatabaseManager e
this.connection = this.connectionSource.getConnection();
this.connection.setAutoCommit(false);
this.statement = this.connection.prepareStatement(this.sqlStatement);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new AppenderLoggingException(
"Cannot write logging event or flush buffer; JDBC manager cannot connect to the database.", e
);
@@ -127,12 +127,12 @@ public final class JdbcDatabaseManager e
if (this.connection != null && !this.connection.isClosed()) {
this.connection.commit();
}
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new AppenderLoggingException("Failed to commit transaction logging event or flushing buffer.", e);
} finally {
try {
Closer.close(this.statement);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warn("Failed to close SQL statement logging event or flushing buffer.", e);
} finally {
this.statement = null;
@@ -140,7 +140,7 @@ public final class JdbcDatabaseManager e
try {
Closer.close(this.connection);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warn("Failed to close database connection logging event or flushing buffer.", e);
} finally {
this.connection = null;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaDatabaseManager.java Wed Jun 25 04:51:00 2014
@@ -74,7 +74,7 @@ public final class JpaDatabaseManager ex
this.entityManager = this.entityManagerFactory.createEntityManager();
this.transaction = this.entityManager.getTransaction();
this.transaction.begin();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new AppenderLoggingException(
"Cannot write logging event or flush buffer; manager cannot create EntityManager or transaction.", e
);
@@ -114,7 +114,7 @@ public final class JpaDatabaseManager ex
if (this.transaction != null && this.transaction.isActive()) {
this.transaction.commit();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
if (this.transaction != null && this.transaction.isActive()) {
this.transaction.rollback();
}
@@ -124,7 +124,7 @@ public final class JpaDatabaseManager ex
if (this.entityManager != null && this.entityManager.isOpen()) {
this.entityManager.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warn("Failed to close entity manager while logging event or flushing buffer.", e);
} finally {
this.entityManager = null;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java Wed Jun 25 04:51:00 2014
@@ -79,7 +79,7 @@ public final class MapRewritePolicy impl
}
final MapMessage message = ((MapMessage) msg).newInstance(newMap);
if (source instanceof Log4jLogEvent) {
- Log4jLogEvent event = (Log4jLogEvent) source;
+ final Log4jLogEvent event = (Log4jLogEvent) source;
return Log4jLogEvent.createEvent(event.getLoggerName(), event.getMarker(), event.getLoggerFqcn(),
event.getLevel(), message, event.getThrown(), event.getThrownProxy(), event.getContextMap(),
event.getContextStack(), event.getThreadName(), event.getSource(), event.getTimeMillis());
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Wed Jun 25 04:51:00 2014
@@ -399,13 +399,13 @@ public class DefaultRolloverStrategy imp
if (maxIndex < 0) {
return null;
}
- long start = System.nanoTime();
- int fileIndex = purge(minIndex, maxIndex, manager);
+ final long start = System.nanoTime();
+ final int fileIndex = purge(minIndex, maxIndex, manager);
if (fileIndex < 0) {
return null;
}
if (LOGGER.isTraceEnabled()) {
- double duration = (System.nanoTime() - start) / (1000.0 * 1000.0 * 1000.0);
+ final double duration = (System.nanoTime() - start) / (1000.0 * 1000.0 * 1000.0);
LOGGER.trace("DefaultRolloverStrategy.purge() took {} seconds", duration);
}
final StringBuilder buf = new StringBuilder(255);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java Wed Jun 25 04:51:00 2014
@@ -60,16 +60,16 @@ public class OnStartupTriggeringPolicy i
// The reflection is necessary because without it, Google App Engine
// will refuse to initialize this class.
try {
- Class<?> factoryClass = Loader.loadSystemClass("java.lang.management.ManagementFactory");
- Method getRuntimeMXBean = factoryClass.getMethod("getRuntimeMXBean");
- Object runtimeMXBean = getRuntimeMXBean.invoke(null);
+ final Class<?> factoryClass = Loader.loadSystemClass("java.lang.management.ManagementFactory");
+ final Method getRuntimeMXBean = factoryClass.getMethod("getRuntimeMXBean");
+ final Object runtimeMXBean = getRuntimeMXBean.invoke(null);
- Class<?> runtimeMXBeanClass = Loader.loadSystemClass("java.lang.management.RuntimeMXBean");
- Method getStartTime = runtimeMXBeanClass.getMethod("getStartTime");
- Long result = (Long) getStartTime.invoke(runtimeMXBean);
+ final Class<?> runtimeMXBeanClass = Loader.loadSystemClass("java.lang.management.RuntimeMXBean");
+ final Method getStartTime = runtimeMXBeanClass.getMethod("getStartTime");
+ final Long result = (Long) getStartTime.invoke(runtimeMXBean);
return result.longValue();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
StatusLogger.getLogger().error("Unable to call ManagementFactory.getRuntimeMXBean().getStartTime(), " //
+ "using system time for OnStartupTriggeringPolicy", t);
// We have little option but to declare "now" as the beginning of time.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java Wed Jun 25 04:51:00 2014
@@ -167,7 +167,7 @@ public class PatternProcessor {
prevFileTime = nextFileTime;
}
- private long debugGetNextTime(long nextTime) {
+ private long debugGetNextTime(final long nextTime) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("PatternProcessor.getNextTime returning {}, nextFileTime={}, prevFileTime={}, current={}, freq={}", //
format(nextTime), format(nextFileTime), format(prevFileTime), format(System.currentTimeMillis()), frequency);
@@ -175,7 +175,7 @@ public class PatternProcessor {
return nextTime;
}
- private String format(long time) {
+ private String format(final long time) {
return new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss.SSS").format(new Date(time));
}
@@ -205,8 +205,8 @@ public class PatternProcessor {
// for creating the file name of rolled-over files.
final long time = prevFileTime == 0 ? System.currentTimeMillis() : prevFileTime;
formatFileName(buf, new Date(time), obj);
- LogEvent event = new Log4jLogEvent(time);
- String fileName = subst.replace(event, buf);
+ final LogEvent event = new Log4jLogEvent(time);
+ final String fileName = subst.replace(event, buf);
buf.setLength(0);
buf.append(fileName);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java Wed Jun 25 04:51:00 2014
@@ -65,7 +65,7 @@ public class RollingRandomAccessFileMana
if (layout == null) {
return;
}
- byte[] header = layout.getHeader();
+ final byte[] header = layout.getHeader();
if (header == null) {
return;
}
@@ -198,7 +198,7 @@ public class RollingRandomAccessFileMana
if (raf != null) {
try {
raf.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("Cannot close RandomAccessFile {}", name, e);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java Wed Jun 25 04:51:00 2014
@@ -92,7 +92,7 @@ public class SizeBasedTriggeringPolicy i
*/
@Override
public boolean isTriggeringEvent(final LogEvent event) {
- boolean triggered = manager.getFileSize() > maxFileSize;
+ final boolean triggered = manager.getFileSize() > maxFileSize;
if (triggered) {
manager.getPatternProcessor().updateTime();
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java Wed Jun 25 04:51:00 2014
@@ -60,7 +60,7 @@ public final class ZipCompressAction ext
* does not cause an exception to be thrown or affect return value.
* @param level TODO
*/
- public ZipCompressAction(final File source, final File destination, final boolean deleteSource, int level) {
+ public ZipCompressAction(final File source, final File destination, final boolean deleteSource, final int level) {
if (source == null) {
throw new NullPointerException("source");
}
@@ -97,7 +97,7 @@ public final class ZipCompressAction ext
* @return true if source file compressed.
* @throws IOException on IO exception.
*/
- public static boolean execute(final File source, final File destination, final boolean deleteSource, int level)
+ public static boolean execute(final File source, final File destination, final boolean deleteSource, final int level)
throws IOException {
if (source.exists()) {
final FileInputStream fis = new FileInputStream(source);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Wed Jun 25 04:51:00 2014
@@ -231,7 +231,7 @@ public class AsyncLogger extends Logger
threadlocalInfo.set(info);
}
- Disruptor<RingBufferLogEvent> temp = disruptor;
+ final Disruptor<RingBufferLogEvent> temp = disruptor;
if (temp == null) { // LOG4J2-639
LOGGER.fatal("Ignoring log event after log4j was shut down");
return;
@@ -278,7 +278,7 @@ public class AsyncLogger extends Logger
// That could result in adding a log event to the disruptor after it was shut down,
// which could cause the publishEvent method to hang and never return.
disruptor.publishEvent(info.translator);
- } catch (NullPointerException npe) {
+ } catch (final NullPointerException npe) {
LOGGER.fatal("Ignoring log event after log4j was shut down.");
}
}
@@ -326,7 +326,7 @@ public class AsyncLogger extends Logger
/**
* Returns {@code true} if the specified disruptor still has unprocessed events.
*/
- private static boolean hasBacklog(Disruptor<?> disruptor) {
+ private static boolean hasBacklog(final Disruptor<?> disruptor) {
final RingBuffer<?> ringBuffer = disruptor.getRingBuffer();
return !ringBuffer.hasAvailableCapacity(ringBuffer.getBufferSize());
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Wed Jun 25 04:51:00 2014
@@ -144,7 +144,7 @@ public class AsyncLoggerConfig extends L
*
* @param contextName name of the {@code LoggerContext}
*/
- public RingBufferAdmin createRingBufferAdmin(String contextName) {
+ public RingBufferAdmin createRingBufferAdmin(final String contextName) {
return helper.createRingBufferAdmin(contextName, getName());
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java Wed Jun 25 04:51:00 2014
@@ -89,8 +89,8 @@ class AsyncLoggerConfigHelper {
= new EventTranslatorTwoArg<Log4jEventWrapper, LogEvent, AsyncLoggerConfig>() {
@Override
- public void translateTo(Log4jEventWrapper ringBufferElement, long sequence,
- LogEvent logEvent, AsyncLoggerConfig loggerConfig) {
+ public void translateTo(final Log4jEventWrapper ringBufferElement, final long sequence,
+ final LogEvent logEvent, final AsyncLoggerConfig loggerConfig) {
ringBufferElement.event = logEvent;
ringBufferElement.loggerConfig = loggerConfig;
}
@@ -283,7 +283,7 @@ class AsyncLoggerConfigHelper {
/**
* Returns {@code true} if the specified disruptor still has unprocessed events.
*/
- private static boolean hasBacklog(Disruptor<?> disruptor) {
+ private static boolean hasBacklog(final Disruptor<?> disruptor) {
final RingBuffer<?> ringBuffer = disruptor.getRingBuffer();
return !ringBuffer.hasAvailableCapacity(ringBuffer.getBufferSize());
}
@@ -316,7 +316,7 @@ class AsyncLoggerConfigHelper {
* calling thread needs to process the event itself
*/
public boolean callAppendersFromAnotherThread(final LogEvent event) {
- Disruptor<Log4jEventWrapper> temp = disruptor;
+ final Disruptor<Log4jEventWrapper> temp = disruptor;
if (temp == null) { // LOG4J2-639
LOGGER.fatal("Ignoring log event after log4j was shut down");
return true;
@@ -340,7 +340,7 @@ class AsyncLoggerConfigHelper {
// That could result in adding a log event to the disruptor after it was shut down,
// which could cause the publishEvent method to hang and never return.
disruptor.getRingBuffer().publishEvent(translator, logEvent, asyncLoggerConfig);
- } catch (NullPointerException npe) {
+ } catch (final NullPointerException npe) {
LOGGER.fatal("Ignoring log event after log4j was shut down.");
}
return true;
@@ -353,7 +353,7 @@ class AsyncLoggerConfigHelper {
* @param contextName name of the {@code LoggerContext}
* @param loggerConfigName name of the logger config
*/
- public RingBufferAdmin createRingBufferAdmin(String contextName, String loggerConfigName) {
+ public RingBufferAdmin createRingBufferAdmin(final String contextName, final String loggerConfigName) {
return RingBufferAdmin.forAsyncLoggerConfig(disruptor.getRingBuffer(), contextName, loggerConfigName);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java Wed Jun 25 04:51:00 2014
@@ -201,7 +201,7 @@ public class RingBufferLogEvent implemen
@Override
public long getTimeMillis() {
- Message msg = getMessage();
+ final Message msg = getMessage();
if (msg instanceof TimestampMessage) { // LOG4J2-455
return ((TimestampMessage) msg).getTimestamp();
}
@@ -255,7 +255,7 @@ public class RingBufferLogEvent implemen
);
}
- private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+ private void writeObject(final java.io.ObjectOutputStream out) throws IOException {
getThrownProxy(); // initialize the ThrowableProxy before serializing
out.defaultWriteObject();
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java Wed Jun 25 04:51:00 2014
@@ -174,7 +174,7 @@ public abstract class AbstractConfigurat
// LOG4J2-392 first stop AsyncLogger Disruptor thread
final LoggerContextFactory factory = LogManager.getFactory();
if (factory instanceof Log4jContextFactory) {
- ContextSelector selector = ((Log4jContextFactory) factory).getSelector();
+ final ContextSelector selector = ((Log4jContextFactory) factory).getSelector();
if (selector instanceof AsyncLoggerContextSelector) { // all loggers are async
// TODO until LOG4J2-493 is fixed we can only stop AsyncLogger once!
// but LoggerContext.setConfiguration will call config.stop()
@@ -276,11 +276,11 @@ public abstract class AbstractConfigurat
}
}
- protected void createAdvertiser(String advertiserString, ConfigurationSource configSource,
- byte[] buffer, String contentType) {
+ protected void createAdvertiser(final String advertiserString, final ConfigurationSource configSource,
+ final byte[] buffer, final String contentType) {
if (advertiserString != null) {
- Node node = new Node(null, advertiserString, null);
- Map<String, String> attributes = node.getAttributes();
+ final Node node = new Node(null, advertiserString, null);
+ final Map<String, String> attributes = node.getAttributes();
attributes.put("content", new String(buffer));
attributes.put("contentType", contentType);
attributes.put("name", "configuration");
@@ -294,7 +294,7 @@ public abstract class AbstractConfigurat
private void setupAdvertisement() {
if (advertiserNode != null)
{
- String name = advertiserNode.getName();
+ final String name = advertiserNode.getName();
@SuppressWarnings("unchecked")
final PluginType<Advertiser> type = (PluginType<Advertiser>) pluginManager.getPluginType(name);
if (type != null)
@@ -326,7 +326,7 @@ public abstract class AbstractConfigurat
@SuppressWarnings("unchecked")
protected void doConfigure() {
if (rootNode.hasChildren() && rootNode.getChildren().get(0).getName().equalsIgnoreCase("Properties")) {
- Node first = rootNode.getChildren().get(0);
+ final Node first = rootNode.getChildren().get(0);
createConfiguration(first, null);
if (first.getObject() != null) {
subst.setVariableResolver((StrLookup) first.getObject());
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java Wed Jun 25 04:51:00 2014
@@ -171,7 +171,7 @@ public class ConfigurationSource {
if (this == NULL_SOURCE) {
return "NULL_SOURCE";
}
- int length = data == null ? -1 : data.length;
+ final int length = data == null ? -1 : data.length;
return "stream (" + length + " bytes, unknown location)";
}
}
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java Wed Jun 25 04:51:00 2014
@@ -81,7 +81,7 @@ public class FileConfigurationMonitor im
if (file.lastModified() > lastModified) {
lastModified = file.lastModified();
for (final ConfigurationListener listener : listeners) {
- Thread thread = new Thread(new ReconfigurationWorker(listener, reconfigurable));
+ final Thread thread = new Thread(new ReconfigurationWorker(listener, reconfigurable));
thread.setDaemon(true);
thread.start();
}
@@ -97,7 +97,7 @@ public class FileConfigurationMonitor im
private final ConfigurationListener listener;
private final Reconfigurable reconfigurable;
- public ReconfigurationWorker(ConfigurationListener listener, Reconfigurable reconfigurable) {
+ public ReconfigurationWorker(final ConfigurationListener listener, final Reconfigurable reconfigurable) {
this.listener = listener;
this.reconfigurable = reconfigurable;
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java Wed Jun 25 04:51:00 2014
@@ -180,8 +180,8 @@ public class JsonConfiguration extends A
LOGGER.debug("Processing node for object {}", itemEntry.getKey());
itemChildren.add(constructNode(itemEntry.getKey(), item, itemEntry.getValue()));
} else if (itemEntry.getValue().isArray()) {
- JsonNode array = itemEntry.getValue();
- String entryName = itemEntry.getKey();
+ final JsonNode array = itemEntry.getValue();
+ final String entryName = itemEntry.getKey();
LOGGER.debug("Processing array for object {}", entryName);
for (int j = 0; j < array.size(); ++j) {
itemChildren.add(constructNode(entryName, item, array.get(j)));
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java Wed Jun 25 04:51:00 2014
@@ -114,7 +114,7 @@ public class PluginBuilder<T> implements
final Builder<T> builder = createBuilder(this.clazz);
if (builder != null) {
injectFields(builder);
- T result = builder.build();
+ final T result = builder.build();
LOGGER.debug("Built Plugin[name={}] OK from builder factory method.", pluginType.getElementName());
return result;
}
@@ -218,7 +218,7 @@ public class PluginBuilder<T> implements
for (int i = 0; i < annotations.length; i++) {
log.append(log.length() == 0 ? "with params(" : ", ");
final String[] aliases = extractPluginAliases(annotations[i]);
- for (Annotation a : annotations[i]) {
+ for (final Annotation a : annotations[i]) {
if (a instanceof PluginAliases) {
continue; // already processed
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java Wed Jun 25 04:51:00 2014
@@ -172,7 +172,7 @@ public class ResolverUtil {
while (urls.hasMoreElements()) {
try {
final URL url = urls.nextElement();
- String urlPath = extractPath(url);
+ final String urlPath = extractPath(url);
LOGGER.info("Scanning for classes in [" + urlPath + "] matching criteria: " + test);
// Check for a jar in a war in JBoss
@@ -314,11 +314,11 @@ public class ResolverUtil {
* @param jarStream
* @param source
*/
- private void close(JarInputStream jarStream, final Object source) {
+ private void close(final JarInputStream jarStream, final Object source) {
if (jarStream != null) {
try {
jarStream.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
LOGGER.error("Error closing JAR file stream for {}", source, e);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java Wed Jun 25 04:51:00 2014
@@ -103,10 +103,10 @@ public final class TypeConverters {
if (value == null || value.isEmpty()) {
bytes = new byte[0];
} else if (value.startsWith(PREFIX_BASE64)) {
- String lexicalXSDBase64Binary = value.substring(PREFIX_BASE64.length());
+ final String lexicalXSDBase64Binary = value.substring(PREFIX_BASE64.length());
bytes = DatatypeConverter.parseBase64Binary(lexicalXSDBase64Binary);
} else if (value.startsWith(PREFIX_0x)) {
- String lexicalXSDHexBinary = value.substring(PREFIX_0x.length());
+ final String lexicalXSDHexBinary = value.substring(PREFIX_0x.length());
bytes = DatatypeConverter.parseHexBinary(lexicalXSDHexBinary);
} else {
bytes = value.getBytes(Charset.defaultCharset());
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java Wed Jun 25 04:51:00 2014
@@ -77,7 +77,7 @@ public abstract class AbstractPluginVisi
}
@Override
- public PluginVisitor<A> setStrSubstitutor(StrSubstitutor substitutor) {
+ public PluginVisitor<A> setStrSubstitutor(final StrSubstitutor substitutor) {
this.substitutor = Assert.requireNonNull(substitutor, "No StrSubstitutor was provided");
return this;
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java Wed Jun 25 04:51:00 2014
@@ -102,7 +102,7 @@ public class XmlConfiguration extends Ab
// Alternative: We could specify all features and values with system properties like:
// -DLog4j.DocumentBuilderFactory.Feature="http://apache.org/xml/features/xinclude/fixup-base-uris true"
factory.setFeature(XINCLUDE_FIXUP_BASE_URIS, true);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
LOGGER.warn("The DocumentBuilderFactory [{}] does not support the feature [{}].", factory,
XINCLUDE_FIXUP_BASE_URIS, e);
} catch (@SuppressWarnings("ErrorNotRethrown") final AbstractMethodError err) {
@@ -110,7 +110,7 @@ public class XmlConfiguration extends Ab
}
try {
factory.setFeature(XINCLUDE_FIXUP_LANGUAGE, true);
- } catch (ParserConfigurationException e) {
+ } catch (final ParserConfigurationException e) {
LOGGER.warn("The DocumentBuilderFactory [{}] does not support the feature [{}].", factory,
XINCLUDE_FIXUP_LANGUAGE, e);
} catch (@SuppressWarnings("ErrorNotRethrown") final AbstractMethodError err) {
@@ -192,7 +192,7 @@ public class XmlConfiguration extends Ab
LOGGER.error("Error parsing Log4j schema", ex);
}
if (schema != null) {
- Validator validator = schema.newValidator();
+ final Validator validator = schema.newValidator();
try {
validator.validate(new StreamSource(new ByteArrayInputStream(buffer)));
} catch (final IOException ioe) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java Wed Jun 25 04:51:00 2014
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.dataformat.
public class YamlConfiguration extends JsonConfiguration {
- public YamlConfiguration(ConfigurationSource configSource) {
+ public YamlConfiguration(final ConfigurationSource configSource) {
super(configSource);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Wed Jun 25 04:51:00 2014
@@ -165,7 +165,7 @@ public class Log4jLogEvent implements Lo
* @param timestamp The timestamp of the event.
*/
private Log4jLogEvent(final String loggerName, final Marker marker, final String loggerFQCN, final Level level,
- final Message message, final Throwable thrown, ThrowableProxy thrownProxy,
+ final Message message, final Throwable thrown, final ThrowableProxy thrownProxy,
final Map<String, String> contextMap, final ThreadContext.ContextStack contextStack,
final String threadName, final StackTraceElement source, final long timestamp) {
this.loggerName = loggerName;
@@ -413,7 +413,7 @@ public class Log4jLogEvent implements Lo
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) {
return true;
}
@@ -421,7 +421,7 @@ public class Log4jLogEvent implements Lo
return false;
}
- Log4jLogEvent that = (Log4jLogEvent) o;
+ final Log4jLogEvent that = (Log4jLogEvent) o;
if (endOfBatch != that.endOfBatch) {
return false;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReflectiveCallerClassUtility.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReflectiveCallerClassUtility.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReflectiveCallerClassUtility.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReflectiveCallerClassUtility.java Wed Jun 25 04:51:00 2014
@@ -145,16 +145,16 @@ public final class ReflectiveCallerClass
* @param depth The depth of the caller to retrieve.
* @return the caller class, or {@code null} if {@code getCallerClass(int)} is not supported.
*/
- public static Class<?> getCaller(int depth) {
+ public static Class<?> getCaller(final int depth) {
if (!GET_CALLER_CLASS_SUPPORTED) {
return null;
}
try {
return (Class<?>) GET_CALLER_CLASS_METHOD.invoke(null, depth + 1 + JAVA_7U25_COMPENSATION_OFFSET);
- } catch (IllegalAccessException ignore) {
+ } catch (final IllegalAccessException ignore) {
LOGGER.warn("Should not have failed to call getCallerClass.");
- } catch (InvocationTargetException ignore) {
+ } catch (final InvocationTargetException ignore) {
LOGGER.warn("Should not have failed to call getCallerClass.");
}
return null;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java Wed Jun 25 04:51:00 2014
@@ -202,7 +202,7 @@ public final class ThrowableFormatOption
int lines = DEFAULT.lines;
String separator = DEFAULT.separator;
List<String> packages = DEFAULT.packages;
- for (String rawOption : options) {
+ for (final String rawOption : options) {
if (rawOption != null) {
final String option = rawOption.trim();
if (option.isEmpty()) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/RingBufferAdmin.java Wed Jun 25 04:51:00 2014
@@ -30,21 +30,21 @@ public class RingBufferAdmin implements
private final RingBuffer<?> ringBuffer;
private final ObjectName objectName;
- public static RingBufferAdmin forAsyncLogger(RingBuffer<?> ringBuffer, String contextName) {
+ public static RingBufferAdmin forAsyncLogger(final RingBuffer<?> ringBuffer, final String contextName) {
final String ctxName = Server.escape(contextName);
final String name = String.format(PATTERN_ASYNC_LOGGER, ctxName);
return new RingBufferAdmin(ringBuffer, name);
}
- public static RingBufferAdmin forAsyncLoggerConfig(RingBuffer<?> ringBuffer,
- String contextName, String configName) {
+ public static RingBufferAdmin forAsyncLoggerConfig(final RingBuffer<?> ringBuffer,
+ final String contextName, final String configName) {
final String ctxName = Server.escape(contextName);
final String cfgName = Server.escape(configName);
final String name = String.format(PATTERN_ASYNC_LOGGER_CONFIG, ctxName, cfgName);
return new RingBufferAdmin(ringBuffer, name);
}
- protected RingBufferAdmin(RingBuffer<?> ringBuffer, String mbeanName) {
+ protected RingBufferAdmin(final RingBuffer<?> ringBuffer, final String mbeanName) {
this.ringBuffer = Assert.requireNonNull(ringBuffer, "ringbuffer");
try {
objectName = new ObjectName(mbeanName);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Wed Jun 25 04:51:00 2014
@@ -119,7 +119,7 @@ public final class Server {
reregisterMBeansAfterReconfigure(mbs);
}
- public static void reregisterMBeansAfterReconfigure(MBeanServer mbs) {
+ public static void reregisterMBeansAfterReconfigure(final MBeanServer mbs) {
if (Boolean.getBoolean(PROPERTY_DISABLE_JMX)) {
LOGGER.debug("JMX disabled for log4j2. Not registering MBeans.");
return;
@@ -134,7 +134,7 @@ public final class Server {
return;
}
final List<LoggerContext> contexts = selector.getLoggerContexts();
- for (LoggerContext ctx : contexts) {
+ for (final LoggerContext ctx : contexts) {
// first unregister the context and all nested loggers,
// appenders, statusLogger, contextSelector, ringbuffers...
unregisterLoggerContext(ctx.getName(), mbs);
@@ -143,7 +143,7 @@ public final class Server {
register(mbs, mbean, mbean.getObjectName());
if (ctx instanceof AsyncLoggerContext) {
- RingBufferAdmin rbmbean = AsyncLogger.createRingBufferAdmin(ctx.getName());
+ final RingBufferAdmin rbmbean = AsyncLogger.createRingBufferAdmin(ctx.getName());
register(mbs, rbmbean, rbmbean.getObjectName());
}
@@ -176,7 +176,7 @@ public final class Server {
*
* @param mbs the MBean server to unregister from.
*/
- public static void unregisterMBeans(MBeanServer mbs) {
+ public static void unregisterMBeans(final MBeanServer mbs) {
unregisterStatusLogger("*", mbs);
unregisterContextSelector("*", mbs);
unregisterContexts(mbs);
@@ -197,7 +197,7 @@ public final class Server {
private static ContextSelector getContextSelector() {
final LoggerContextFactory factory = LogManager.getFactory();
if (factory instanceof Log4jContextFactory) {
- ContextSelector selector = ((Log4jContextFactory) factory).getSelector();
+ final ContextSelector selector = ((Log4jContextFactory) factory).getSelector();
return selector;
}
return null;
@@ -210,7 +210,7 @@ public final class Server {
*
* @param loggerContextName name of the logger context to unregister
*/
- public static void unregisterLoggerContext(String loggerContextName) {
+ public static void unregisterLoggerContext(final String loggerContextName) {
final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
unregisterLoggerContext(loggerContextName, mbs);
}
@@ -223,7 +223,7 @@ public final class Server {
* @param contextName name of the logger context to unregister
* @param mbs the MBean Server to unregister the instrumented objects from
*/
- public static void unregisterLoggerContext(String contextName, MBeanServer mbs) {
+ public static void unregisterLoggerContext(final String contextName, final MBeanServer mbs) {
final String pattern = LoggerContextAdminMBean.PATTERN;
final String search = String.format(pattern, escape(contextName), "*");
unregisterAllMatching(search, mbs); // unregister context mbean
@@ -324,8 +324,8 @@ public final class Server {
register(mbs, mbean, mbean.getObjectName());
if (cfg instanceof AsyncLoggerConfig) {
- AsyncLoggerConfig async = (AsyncLoggerConfig) cfg;
- RingBufferAdmin rbmbean = async.createRingBufferAdmin(ctx.getName());
+ final AsyncLoggerConfig async = (AsyncLoggerConfig) cfg;
+ final RingBufferAdmin rbmbean = async.createRingBufferAdmin(ctx.getName());
register(mbs, rbmbean, rbmbean.getObjectName());
}
}
@@ -339,7 +339,7 @@ public final class Server {
final Appender appender = map.get(name);
if (appender instanceof AsyncAppender) {
- AsyncAppender async = ((AsyncAppender) appender);
+ final AsyncAppender async = ((AsyncAppender) appender);
final AsyncAppenderAdmin mbean = new AsyncAppenderAdmin(ctx.getName(), async);
register(mbs, mbean, mbean.getObjectName());
} else {
@@ -349,7 +349,7 @@ public final class Server {
}
}
- private static void register(MBeanServer mbs, Object mbean, ObjectName objectName)
+ private static void register(final MBeanServer mbs, final Object mbean, final ObjectName objectName)
throws InstanceAlreadyExistsException, MBeanRegistrationException, NotCompliantMBeanException {
LOGGER.debug("Registering MBean {}", objectName);
mbs.registerMBean(mbean, objectName);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractJacksonLayout.java Wed Jun 25 04:51:00 2014
@@ -33,7 +33,7 @@ abstract class AbstractJacksonLayout ext
protected final boolean compact;
protected final boolean complete;
- protected AbstractJacksonLayout(ObjectWriter objectWriter, Charset charset, boolean compact, boolean complete) {
+ protected AbstractJacksonLayout(final ObjectWriter objectWriter, final Charset charset, final boolean compact, final boolean complete) {
super(charset);
this.objectWriter = objectWriter;
this.compact = compact;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java Wed Jun 25 04:51:00 2014
@@ -38,8 +38,8 @@ public final class LoggerFields {
private final String enterpriseId;
private final boolean discardIfAllFieldsAreEmpty;
- private LoggerFields(final Map<String, String> map, String sdId, String enterpriseId,
- boolean discardIfAllFieldsAreEmpty) {
+ private LoggerFields(final Map<String, String> map, final String sdId, final String enterpriseId,
+ final boolean discardIfAllFieldsAreEmpty) {
this.sdId = sdId;
this.enterpriseId = enterpriseId;
this.map = Collections.unmodifiableMap(map);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Wed Jun 25 04:51:00 2014
@@ -113,8 +113,8 @@ public final class PatternLayout extends
* @param header
*/
private PatternLayout(final Configuration config, final RegexReplacement replace, final String pattern,
- final Charset charset, final boolean alwaysWriteExceptions, boolean noConsoleNoAnsi,
- String header, String footer) {
+ final Charset charset, final boolean alwaysWriteExceptions, final boolean noConsoleNoAnsi,
+ final String header, final String footer) {
super(charset);
this.replace = replace;
this.conversionPattern = pattern;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java Wed Jun 25 04:51:00 2014
@@ -189,7 +189,7 @@ public final class XmlLayout extends Abs
private static final String ROOT_TAG = "Events";
- protected XmlLayout(final boolean locationInfo, final boolean properties, final boolean complete, boolean compact, final Charset charset) {
+ protected XmlLayout(final boolean locationInfo, final boolean properties, final boolean complete, final boolean compact, final Charset charset) {
super(new JacksonFactory.XML().newWriter(locationInfo, properties, compact), charset, compact, complete);
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java Wed Jun 25 04:51:00 2014
@@ -59,7 +59,7 @@ public class JndiLookup implements StrLo
try {
ctx = new InitialContext();
return (String) ctx.lookup(convertJndiName(key));
- } catch (NamingException e) {
+ } catch (final NamingException e) {
return null;
} finally {
Closer.closeSilent(ctx);
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java Wed Jun 25 04:51:00 2014
@@ -42,19 +42,19 @@ public class ResourceBundleLookup implem
if (key == null) {
return null;
}
- String[] keys = key.split(":");
- int keyLen = keys.length;
+ final String[] keys = key.split(":");
+ final int keyLen = keys.length;
if (keyLen != 2) {
// throw new IllegalArgumentException("Bad key format " + key + ", format is BundleName:Value");
// log?
return null;
}
- String bundleName = keys[0];
- String bundleKey = keys[1];
+ final String bundleName = keys[0];
+ final String bundleKey = keys[1];
try {
// The ResourceBundle class caches bundles, no need to cache here.
return ResourceBundle.getBundle(bundleName).getString(bundleKey);
- } catch (MissingResourceException e) {
+ } catch (final MissingResourceException e) {
// log?
return null;
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java?rev=1605265&r1=1605264&r2=1605265&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java Wed Jun 25 04:51:00 2014
@@ -123,7 +123,7 @@ public abstract class AbstractSocketServ
* @return the new thread that running this server.
*/
public Thread startNewThread() {
- Thread thread = new Thread(this);
+ final Thread thread = new Thread(this);
thread.start();
return thread;
}