[LMS-1890] YeastX: cannot send confirmation email after unarchiving

fix: make the MailClient not request SMTP authentication if it obviously hasn't got valid credentials: deal with the typical Spring injection artefacts like an empty value "" or something like "${propval}" gracefully

SVN: 18746

common/source/java/ch/systemsx/cisd/common/mail/MailClient.java

@@ -40,6 +40,7 @@ import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
@@ -135,7 +136,7 @@ public final class MailClient extends Authenticator implements IMailClient
         {
             properties.put(JavaMailProperties.MAIL_SMTP_HOST, smtpHost);
         }
-        if (smtpPassword != null && smtpUsername != null)
+        if (StringUtils.isNotBlank(smtpPassword) && StringUtils.isNotBlank(smtpUsername))
         {
             properties.put(JavaMailProperties.MAIL_SMTP_AUTH, Boolean.TRUE.toString());
         }

common/source/java/ch/systemsx/cisd/common/mail/MailClientParameters.java

@@ -52,6 +52,11 @@ public class MailClientParameters implements Serializable
 
     public final void setSmtpUser(String smtpUser)
     {
+        // Check for Spring injection artefact
+        if (smtpUser != null && smtpUser.startsWith("${"))
+        {
+            this.smtpUser = null;
+        }
         this.smtpUser = smtpUser;
     }
 
@@ -62,6 +67,11 @@ public class MailClientParameters implements Serializable
 
     public final void setSmtpPassword(String smtpPassword)
     {
+        // Check for Spring injection artefact
+        if (smtpPassword != null && smtpPassword.startsWith("${"))
+        {
+            this.smtpPassword = null;
+        }
         this.smtpPassword = smtpPassword;
     }