CLEAN NULL SUBJECT PREFIX

Add condition to clean value if User choose not to have a Subject Prefix Signed-off-by: Andres Tito <[email protected]>
DependencyTrack · Jan 29, 2024 · f0cf7c5 · f0cf7c5
1 parent 2b6363f
commit f0cf7c5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/dependencytrack/notification/publisher/SendMailPublisher.java b/src/main/java/org/dependencytrack/notification/publisher/SendMailPublisher.java
@@ -98,13 +98,13 @@ private void sendNotification(final PublishContext ctx, Notification notificatio
 
         final boolean smtpEnabled;
         final String smtpFrom;
-        final String smtpPrefix;
         final String smtpHostname;
         final int smtpPort;
         final String smtpUser;
         final String encryptedSmtpPassword;
         final boolean smtpSslTls;
         final boolean smtpTrustCert;
+        String smtpPrefix;
 
         try (QueryManager qm = new QueryManager()) {
             smtpEnabled = qm.isEnabled(EMAIL_SMTP_ENABLED);
@@ -115,6 +115,7 @@ private void sendNotification(final PublishContext ctx, Notification notificatio
 
             smtpFrom = qm.getConfigProperty(EMAIL_SMTP_FROM_ADDR.getGroupName(), EMAIL_SMTP_FROM_ADDR.getPropertyName()).getPropertyValue();
             smtpPrefix = qm.getConfigProperty(EMAIL_PREFIX.getGroupName(), EMAIL_PREFIX.getPropertyName()).getPropertyValue();
+            smtpPrefix = smtpPrefix == null ? " " : smtpPrefix;
             smtpHostname = qm.getConfigProperty(EMAIL_SMTP_SERVER_HOSTNAME.getGroupName(), EMAIL_SMTP_SERVER_HOSTNAME.getPropertyName()).getPropertyValue();
             smtpPort = Integer.parseInt(qm.getConfigProperty(EMAIL_SMTP_SERVER_PORT.getGroupName(), EMAIL_SMTP_SERVER_PORT.getPropertyName()).getPropertyValue());
             smtpUser = qm.getConfigProperty(EMAIL_SMTP_USERNAME.getGroupName(), EMAIL_SMTP_USERNAME.getPropertyName()).getPropertyValue();