[BACKLOG-39799] - Remove excessive logging when sending email to a no…

…n-existing group
pentaho · Jan 30, 2024 · 6a5de41 · 6a5de41
1 parent a6a883c
commit 6a5de41
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/core/src/main/java/org/pentaho/platform/util/ActionUtil.java b/core/src/main/java/org/pentaho/platform/util/ActionUtil.java
@@ -456,10 +456,15 @@ public static void sendEmail( Map<String, Object> actionParams, Map<String, Seri
       }
       String resolveToList = emailGroupResolver.resolve(to);
       if (resolveToList != null && resolveToList.length() > 0) {
-        emailer.setTo( emailGroupResolver.resolve( to ) );
-        emailer.setCc( emailGroupResolver.resolve( cc ) );
-        emailer.setBcc( emailGroupResolver.resolve( bcc ) );
-
+        emailer.setTo( resolveToList );
+        String resolveCCList = emailGroupResolver.resolve(cc);
+        if (resolveCCList != null && resolveCCList.length() > 0) {
+          emailer.setCc( resolveCCList );
+        }
+        String resolveBCCList = emailGroupResolver.resolve( bcc );
+        if (resolveBCCList != null && resolveBCCList.length() > 0) {
+          emailer.setBcc( resolveBCCList );
+        }
         String subject = ( String ) actionParams.get( "_SCH_EMAIL_SUBJECT" );
         if (subject != null && !"".equals( subject ) ) {
           emailer.setSubject( subject );