You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/07/13 16:28:06 UTC
[logging-log4j2] branch release-2.x updated: Replace {}} with {}
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 4cd0f77 Replace {}} with {}
new a2b91b2 Merge pull request #386 from Thihup/fix-log4j1-msg-2
4cd0f77 is described below
commit 4cd0f77124a963c522d0f0ddca58e48063e45c96
Author: Thiago Henrique Hüpner <th...@gmail.com>
AuthorDate: Mon Jul 13 12:48:24 2020 -0300
Replace {}} with {}
---
.../main/java/org/apache/log4j/config/PropertiesConfiguration.java | 2 +-
.../src/main/java/org/apache/log4j/xml/XmlConfiguration.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
index 2a63461..80daf33 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
@@ -389,7 +389,7 @@ public class PropertiesConfiguration extends Log4j1Configuration {
logger.getName());
logger.addAppender(getAppender(appenderName), null, null);
} else {
- LOGGER.debug("Appender named [{}}] not found.", appenderName);
+ LOGGER.debug("Appender named [{}] not found.", appenderName);
}
}
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
index 4e59ee4..4cb4d73 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
@@ -382,7 +382,7 @@ public class XmlConfiguration extends Log4j1Configuration {
appender.getName());
aa.addAppender(child);
} else {
- LOGGER.error("Requesting attachment of appender named [{}] to appender named [{}}]"
+ LOGGER.error("Requesting attachment of appender named [{}] to appender named [{}]"
+ "which does not implement org.apache.log4j.spi.AppenderAttachable.",
refName, appender.getName());
}
@@ -537,7 +537,7 @@ public class XmlConfiguration extends Log4j1Configuration {
loggerConfig.getName());
loggerConfig.addAppender(getAppender(refName), null, null);
} else {
- LOGGER.debug("Appender named [{}}] not found.", refName);
+ LOGGER.debug("Appender named [{}] not found.", refName);
}
break;
}
@@ -614,7 +614,7 @@ public class XmlConfiguration extends Log4j1Configuration {
}
String priStr = subst(element.getAttribute(VALUE_ATTR));
- LOGGER.debug("Level value for {} is [{}}].", catName, priStr);
+ LOGGER.debug("Level value for {} is [{}].", catName, priStr);
if (INHERITED.equalsIgnoreCase(priStr) || NULL.equalsIgnoreCase(priStr)) {
if (isRoot) {