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 2023/11/14 06:19:09 UTC
(logging-log4j2) 06/07: Use system properties directly
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 6e00230de955c76ee8564472bb1cb74813388129
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Tue Nov 14 00:01:40 2023 -0600
Use system properties directly
Signed-off-by: Matt Sicker <ma...@apache.org>
---
.../main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java | 3 +--
.../main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java b/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
index 1845d26453..35f9ec64f2 100644
--- a/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
+++ b/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
@@ -50,7 +50,6 @@ import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
import org.apache.logging.log4j.core.util.CyclicBuffer;
import org.apache.logging.log4j.core.util.NetUtils;
import org.apache.logging.log4j.smtp.MimeMessageBuilder;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
/**
@@ -343,7 +342,7 @@ public class SmtpManager extends AbstractManager {
public SmtpManager createManager(final String name, final FactoryData data) {
final String prefix = "mail." + data.protocol;
- final Properties properties = PropertiesUtil.getSystemProperties();
+ final Properties properties = System.getProperties();
properties.setProperty("mail.transport.protocol", data.protocol);
if (properties.getProperty("mail.host") == null) {
// Prevent an UnknownHostException in Java 7
diff --git a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
index 530a1f6fd8..d6182ece7d 100644
--- a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
+++ b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
@@ -50,7 +50,6 @@ import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
import org.apache.logging.log4j.core.util.CyclicBuffer;
import org.apache.logging.log4j.core.util.NetUtils;
import org.apache.logging.log4j.smtp.MimeMessageBuilder;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
/**
@@ -347,7 +346,7 @@ public class SmtpManager extends AbstractManager {
public SmtpManager createManager(final String name, final FactoryData data) {
final String prefix = "mail." + data.protocol;
- final Properties properties = PropertiesUtil.getSystemProperties();
+ final Properties properties = System.getProperties();
properties.setProperty("mail.transport.protocol", data.protocol);
if (properties.getProperty("mail.host") == null) {
// Prevent an UnknownHostException in Java 7