You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2020/07/17 11:37:33 UTC
[logging-log4j2] branch master updated: Replace {}} with {}
This is an automated email from the ASF dual-hosted git repository.
ckozak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 7c905c7 Replace {}} with {}
new ec290e9 Merge pull request #385 from Thihup/fix-log4j1-msg
7c905c7 is described below
commit 7c905c7fa7fb073539e4cbb7abb3f4af98243628
Author: Thiago Henrique Hupner <th...@gmail.com>
AuthorDate: Mon Jul 13 11:45:50 2020 -0300
Replace {}} with {}
---
.../main/java/org/apache/log4j/config/PropertiesConfiguration.java | 2 +-
.../src/main/java/org/apache/log4j/xml/XmlConfiguration.java | 6 +++---
.../src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java | 6 +++---
3 files changed, 7 insertions(+), 7 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 272367c..2ceffaf 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
@@ -390,7 +390,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 d532a13..8e256bc 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
@@ -386,7 +386,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());
}
@@ -545,7 +545,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;
}
@@ -624,7 +624,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) {
diff --git a/log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java b/log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java
index a2f7dc7..0dc66ee 100644
--- a/log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java
+++ b/log4j-1.2-api/src/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java
@@ -472,7 +472,7 @@ public class XmlConfigurationFactory extends ConfigurationFactory implements Con
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());
}
@@ -590,7 +590,7 @@ public class XmlConfigurationFactory extends ConfigurationFactory implements Con
loggerConfig.getName());
loggerConfig.addAppender(configuration.getAppender(refName), null, null);
} else {
- LOGGER.debug("Appender named [{}}] not found.", refName);
+ LOGGER.debug("Appender named [{}] not found.", refName);
}
break;
}
@@ -667,7 +667,7 @@ public class XmlConfigurationFactory extends ConfigurationFactory implements Con
}
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) {