Author: mattsicker
Date: Mon May 26 20:28:16 2014
New Revision: 1597645
URL: http://svn.apache.org/r1597645
Log:
Update use of default values to use typed versions of attributes.
- No generic way to do this for enums other than via strings thanks
to the inability to use generics inside annotations.
Modified:
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/ConsoleAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.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/Rfc5424Layout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
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=1597645&r1=1597644&r2=1597645&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
Mon May 26 20:28:16 2014
@@ -48,7 +48,7 @@ import org.apache.logging.log4j.core.imp
@Plugin(name = "Async", category = "Core", elementType = "appender",
printObject = true)
public final class AsyncAppender extends AbstractAppender {
- private static final String DEFAULT_QUEUE_SIZE = "128";
+ private static final int DEFAULT_QUEUE_SIZE = 128;
private static final String SHUTDOWN = "Shutdown";
private final BlockingQueue<Serializable> queue;
@@ -180,13 +180,13 @@ public final class AsyncAppender extends
@PluginFactory
public static AsyncAppender createAppender(@PluginElement("AppenderRef")
final AppenderRef[] appenderRefs,
@PluginAttribute("errorRef") @PluginAliases("error-ref") final
String errorRef,
- @PluginAttribute(value = "blocking", defaultStringValue = "true")
final boolean blocking,
- @PluginAttribute(value = "bufferSize", defaultStringValue =
DEFAULT_QUEUE_SIZE) final int size,
+ @PluginAttribute(value = "blocking", defaultBooleanValue = true)
final boolean blocking,
+ @PluginAttribute(value = "bufferSize", defaultIntValue =
DEFAULT_QUEUE_SIZE) final int size,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "includeLocation", defaultStringValue =
"false") final boolean includeLocation,
+ @PluginAttribute(value = "includeLocation", defaultBooleanValue =
false) final boolean includeLocation,
@PluginElement("Filter") final Filter filter,
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"true") final boolean ignoreExceptions) {
+ @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final boolean ignoreExceptions) {
if (name == null) {
LOGGER.error("No name provided for AsyncAppender");
return null;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
Mon May 26 20:28:16 2014
@@ -84,8 +84,8 @@ public final class ConsoleAppender exten
@PluginElement("Filters") final Filter filter,
@PluginAttribute(value = "target", defaultStringValue =
"SYSTEM_OUT") final String targetStr,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "follow", defaultStringValue = "false")
final String follow,
- @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"true") final String ignore) {
+ @PluginAttribute(value = "follow", defaultBooleanValue = false)
final String follow,
+ @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final String ignore) {
if (name == null) {
LOGGER.error("No name provided for ConsoleAppender");
return null;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
Mon May 26 20:28:16 2014
@@ -93,22 +93,22 @@ public class SyslogAppender extends Sock
public static SyslogAppender createAppender(
// @formatter:off
@PluginAttribute("host") final String host,
- @PluginAttribute(value = "port", defaultStringValue = "0") final
int port,
+ @PluginAttribute(value = "port", defaultIntValue = 0) final int
port,
@PluginAttribute("protocol") final String protocolStr,
@PluginElement("SSL") final SslConfiguration sslConfig,
- @PluginAttribute(value = "reconnectionDelay", defaultStringValue =
"0") final int reconnectionDelay,
- @PluginAttribute(value = "immediateFail", defaultStringValue =
"true") final boolean immediateFail,
+ @PluginAttribute(value = "reconnectionDelay", defaultIntValue = 0)
final int reconnectionDelay,
+ @PluginAttribute(value = "immediateFail", defaultBooleanValue =
true) final boolean immediateFail,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "immediateFlush", defaultStringValue =
"true") final boolean immediateFlush,
- @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"true") final boolean ignoreExceptions,
+ @PluginAttribute(value = "immediateFlush", defaultBooleanValue =
true) final boolean immediateFlush,
+ @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final boolean ignoreExceptions,
@PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultStringValue =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMdc", defaultStringValue =
"true") final boolean includeMdc,
+ @PluginAttribute(value = "enterpriseNumber", defaultIntValue =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMdc", defaultBooleanValue = true)
final boolean includeMdc,
@PluginAttribute("mdcId") final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultStringValue = "false")
final boolean newLine,
+ @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -121,7 +121,7 @@ public class SyslogAppender extends Sock
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charsetName,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
- @PluginAttribute(value = "advertise", defaultStringValue =
"false") final boolean advertise) {
+ @PluginAttribute(value = "advertise", defaultBooleanValue = false)
final boolean advertise) {
// @formatter:on
// TODO: add Protocol to TypeConverters
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
Mon May 26 20:28:16 2014
@@ -38,10 +38,28 @@ public class PluginAttributeVisitor exte
final Map<String, String> attributes = node.getAttributes();
final String rawValue = removeAttributeValue(attributes, name,
this.aliases);
final String replacedValue = this.substitutor.replace(event, rawValue);
- final String rawDefaultValue = this.annotation.defaultStringValue();
- final String replacedDefaultValue = this.substitutor.replace(event,
rawDefaultValue);
- final Object value = convert(replacedValue, replacedDefaultValue);
+ final Object defaultValue = findDefaultValue(event);
+ final Object value = convert(replacedValue, defaultValue);
LOGGER.debug("Attribute({}=\"{}\"", name, value);
return value;
}
+
+ private Object findDefaultValue(final LogEvent event) {
+ if (this.conversionType == int.class || this.conversionType ==
Integer.class) {
+ return this.annotation.defaultIntValue();
+ }
+ if (this.conversionType == long.class || this.conversionType ==
Long.class) {
+ return this.annotation.defaultLongValue();
+ }
+ if (this.conversionType == boolean.class || this.conversionType ==
Boolean.class) {
+ return this.annotation.defaultBooleanValue();
+ }
+ if (this.conversionType == float.class || this.conversionType ==
Float.class) {
+ return this.annotation.defaultFloatValue();
+ }
+ if (this.conversionType == double.class || this.conversionType ==
Double.class) {
+ return this.annotation.defaultDoubleValue();
+ }
+ return this.substitutor.replace(event,
this.annotation.defaultStringValue());
+ }
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
Mon May 26 20:28:16 2014
@@ -322,7 +322,7 @@ public final class HtmlLayout extends Ab
*/
@PluginFactory
public static HtmlLayout createLayout(
- @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
+ @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
@PluginAttribute(value = "title", defaultStringValue =
DEFAULT_TITLE) final String title,
@PluginAttribute(value = "contentType", defaultStringValue =
DEFAULT_CONTENT_TYPE) String contentType,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
Mon May 26 20:28:16 2014
@@ -854,10 +854,10 @@ public final class JsonLayout extends Ab
@PluginFactory
public static AbstractJacksonLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultStringValue =
"false") final boolean properties,
- @PluginAttribute(value = "complete", defaultStringValue = "false")
final boolean complete,
- @PluginAttribute(value = "compact", defaultStringValue = "false")
final boolean compact,
+ @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultBooleanValue =
false) final boolean properties,
+ @PluginAttribute(value = "complete", defaultBooleanValue = false)
final boolean complete,
+ @PluginAttribute(value = "compact", defaultBooleanValue = false)
final boolean compact,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset
// @formatter:on
) {
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=1597645&r1=1597644&r2=1597645&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
Mon May 26 20:28:16 2014
@@ -73,7 +73,7 @@ public final class LoggerFields {
@PluginElement("LoggerFields") final KeyValuePair[] keyValuePairs,
@PluginAttribute("sdId") final String sdId,
@PluginAttribute("enterpriseId") final String enterpriseId,
- @PluginAttribute(value = "discardIfAllFieldsAreEmpty",
defaultStringValue = "false") final boolean discardIfAllFieldsAreEmpty) {
+ @PluginAttribute(value = "discardIfAllFieldsAreEmpty",
defaultBooleanValue = false) final boolean discardIfAllFieldsAreEmpty) {
final Map<String, String> map = new HashMap<String, String>();
for (final KeyValuePair keyValuePair : keyValuePairs) {
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=1597645&r1=1597644&r2=1597645&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
Mon May 26 20:28:16 2014
@@ -271,8 +271,8 @@ public final class PatternLayout extends
@PluginConfiguration final Configuration config,
@PluginElement("Replace") final RegexReplacement replace,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
- @PluginAttribute(value = "alwaysWriteExceptions",
defaultStringValue = "true") final boolean alwaysWriteExceptions,
- @PluginAttribute(value = "noConsoleNoAnsi", defaultStringValue =
"false") final boolean noConsoleNoAnsi,
+ @PluginAttribute(value = "alwaysWriteExceptions",
defaultBooleanValue = true) final boolean alwaysWriteExceptions,
+ @PluginAttribute(value = "noConsoleNoAnsi", defaultBooleanValue =
false) final boolean noConsoleNoAnsi,
@PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer) {
return new PatternLayout(config, replace, pattern == null ?
DEFAULT_CONVERSION_PATTERN : pattern, charset,
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
Mon May 26 20:28:16 2014
@@ -67,7 +67,7 @@ public final class Rfc5424Layout extends
/**
* Not a very good default - it is the Apache Software Foundation's
enterprise number.
*/
- public static final String DEFAULT_ENTERPRISE_NUMBER = "18060";
+ public static final int DEFAULT_ENTERPRISE_NUMBER = 18060;
/**
* The default event id.
*/
@@ -626,12 +626,12 @@ public final class Rfc5424Layout extends
public static Rfc5424Layout createLayout(
@PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultStringValue =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMDC", defaultStringValue =
"true") final boolean includeMDC,
+ @PluginAttribute(value = "enterpriseNumber", defaultIntValue =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMDC", defaultBooleanValue = true)
final boolean includeMDC,
@PluginAttribute(value = "mdcId", defaultStringValue =
DEFAULT_MDCID) final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultStringValue = "false")
final boolean newLine,
+ @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -639,7 +639,7 @@ public final class Rfc5424Layout extends
@PluginAttribute("mdcIncludes") String includes,
@PluginAttribute("mdcRequired") final String required,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
- @PluginAttribute(value = "useTlsMessageFormat", defaultStringValue
= "false") final boolean useTlsMessageFormat, // RFC 5425
+ @PluginAttribute(value = "useTlsMessageFormat",
defaultBooleanValue = false) final boolean useTlsMessageFormat, // RFC 5425
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
@PluginConfiguration final Configuration config) {
final Charset charset = Charsets.UTF_8;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
Mon May 26 20:28:16 2014
@@ -135,7 +135,7 @@ public final class SyslogLayout extends
@PluginFactory
public static SyslogLayout createLayout(
@PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
- @PluginAttribute(value = "newLine", defaultStringValue = "false")
final boolean includeNewLine,
+ @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean includeNewLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset) {
return new SyslogLayout(facility, includeNewLine, escapeNL, charset);
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=1597645&r1=1597644&r2=1597645&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
Mon May 26 20:28:16 2014
@@ -272,10 +272,10 @@ public final class XmlLayout extends Abs
@PluginFactory
public static XmlLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultStringValue =
"false") final boolean properties,
- @PluginAttribute(value = "complete", defaultStringValue = "false")
final boolean complete,
- @PluginAttribute(value = "compact", defaultStringValue = "false")
final boolean compact,
+ @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultBooleanValue =
false) final boolean properties,
+ @PluginAttribute(value = "complete", defaultBooleanValue = false)
final boolean complete,
+ @PluginAttribute(value = "compact", defaultBooleanValue = false)
final boolean compact,
@PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset)
// @formatter:on
{
Modified:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1597645&r1=1597644&r2=1597645&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
Mon May 26 20:28:16 2014
@@ -220,7 +220,7 @@ public final class FlumeAppender extends
final int delay = Integers.parseInt(maxDelay, DEFAULT_MAX_DELAY);
if (layout == null) {
- final int enterpriseNumber =
Integer.parseInt(Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER);
+ final int enterpriseNumber =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER;
layout = Rfc5424Layout.createLayout(Facility.LOCAL0, null,
enterpriseNumber, true, Rfc5424Layout.DEFAULT_MDCID,
mdcPrefix, eventPrefix, false, null, null, null, excludes,
includes, required, null, false, null,
null);
