#167: fixed testing if there are email validation criteria

bbottema · bbottema · commit 58ea9ba004e5 · 2018-10-03T21:10:35.000+02:00
diff --git a/src/main/java/org/simplejavamail/mailer/Mailer.java b/src/main/java/org/simplejavamail/mailer/Mailer.java
@@ -271,7 +271,7 @@ public boolean validate(final Email email)
 			throw new MailerException(MailerException.MISSING_DISPOSITIONNOTIFICATIONTO);
 		} else if (email.isUseReturnReceiptTo() && email.getReturnReceiptTo() == null) {
 			throw new MailerException(MailerException.MISSING_RETURNRECEIPTTO);
-		} else if (emailAddressCriteria != null) {
+		} else if (!emailAddressCriteria.isEmpty()) {
 			if (!EmailAddressValidator.isValid(email.getFromRecipient().getAddress(), emailAddressCriteria)) {
 				throw new MailerException(format(MailerException.INVALID_SENDER, email));
 			}

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public boolean validate(final Email email)`
`271`	`271`	`throw new MailerException(MailerException.MISSING_DISPOSITIONNOTIFICATIONTO);`
`272`	`272`	`} else if (email.isUseReturnReceiptTo() && email.getReturnReceiptTo() == null) {`
`273`	`273`	`throw new MailerException(MailerException.MISSING_RETURNRECEIPTTO);`
`274`		`- } else if (emailAddressCriteria != null) {`
	`274`	`+ } else if (!emailAddressCriteria.isEmpty()) {`
`275`	`275`	`if (!EmailAddressValidator.isValid(email.getFromRecipient().getAddress(), emailAddressCriteria)) {`
`276`	`276`	`throw new MailerException(format(MailerException.INVALID_SENDER, email));`
`277`	`277`	`}`