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 2022/02/19 23:31:21 UTC
[logging-log4j2] 03/04: Allow for whitespace in configuration files.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 02e2cfc75b9f372ac465d11438d2dff70c933dea
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 19 18:31:09 2022 -0500
Allow for whitespace in configuration files.
---
.../src/main/java/org/apache/log4j/builders/AbstractBuilder.java | 4 ++--
.../org/apache/log4j/builders/appender/SyslogAppenderBuilder.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
index cefb2bd..b0cfdcd 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
@@ -137,7 +137,7 @@ public abstract class AbstractBuilder implements Builder {
String value = properties.getProperty(prefix + toJavaKey(key));
value = value != null ? value : properties.getProperty(prefix + toBeanKey(key), defaultValue);
value = value != null ? substVars(value) : defaultValue;
- return value != null ? value : defaultValue;
+ return value != null ? value.trim() : defaultValue;
}
protected String getValueAttribute(final Element element) {
@@ -146,7 +146,7 @@ public abstract class AbstractBuilder implements Builder {
protected String getValueAttribute(final Element element, final String defaultValue) {
final String attribute = element.getAttribute(VALUE_ATTR);
- return substVars(attribute != null ? attribute : defaultValue);
+ return substVars(attribute != null ? attribute.trim() : defaultValue);
}
protected String substVars(final String value) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java
index 7d7947c..d85287b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java
@@ -162,7 +162,7 @@ public class SyslogAppenderBuilder extends AbstractBuilder implements AppenderBu
port.set(DEFAULT_PORT);
} else if (parts.length == 2) {
host.set(parts[0]);
- port.set(Integer.parseInt(parts[1]));
+ port.set(Integer.parseInt(parts[1].trim()));
} else {
LOGGER.warn("Invalid {} setting: {}. Using default.", SYSLOG_HOST_PARAM, syslogHost);
host.set(DEFAULT_HOST);