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 2021/12/24 23:11:55 UTC
[logging-log4j2] branch release-2.x updated: Fix generics warning.
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
The following commit(s) were added to refs/heads/release-2.x by this push:
new eab9089 Fix generics warning.
eab9089 is described below
commit eab90893c48708ba4941b34361a2980d071c2906
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Dec 24 18:11:50 2021 -0500
Fix generics warning.
---
.../main/java/org/apache/log4j/config/PropertiesConfiguration.java | 5 +++--
.../main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java | 2 +-
2 files changed, 4 insertions(+), 3 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 928f883..8b9b3b9 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
@@ -24,6 +24,7 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
import java.util.SortedMap;
import java.util.StringTokenizer;
@@ -330,9 +331,9 @@ public class PropertiesConfiguration extends Log4j1Configuration {
* Parse non-root elements, such non-root categories and renderers.
*/
private void parseLoggers(Properties props) {
- Enumeration enumeration = props.propertyNames();
+ Enumeration<?> enumeration = props.propertyNames();
while (enumeration.hasMoreElements()) {
- String key = (String) enumeration.nextElement();
+ String key = Objects.toString(enumeration.nextElement(), null);
if (key.startsWith(CATEGORY_PREFIX) || key.startsWith(LOGGER_PREFIX)) {
String loggerName = null;
if (key.startsWith(CATEGORY_PREFIX)) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
index 4d6aecd..b6e9f61 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
@@ -40,7 +40,7 @@ public class AppenderAttachableImpl implements AppenderAttachable {
}
@Override
- public Enumeration getAllAppenders() {
+ public Enumeration<Appender> getAllAppenders() {
return Collections.enumeration(appenders.values());
}