Merge remote-tracking branch 'origin/develop' into develop

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/SendMailClosure.java

@@ -63,24 +63,31 @@ public void executeClosure() {
 				TransportRunner.sendMessage(operationalConfig.getClusterKey(), session, message, message.getAllRecipients());
 			}
 		} catch (final UnsupportedEncodingException e) {
-			LOGGER.error("Failed to send email:\n{}", email);
+			LOGGER.error("Failed to send email:\n{}", email.getId());
+			LOGGER.trace("{}", email);
 			throw new MailerException(MailerException.INVALID_ENCODING, e);
 		} catch (final MessagingException e) {
-			LOGGER.error("Failed to send email:\n{}", email);
+			LOGGER.error("Failed to send email:\n{}", email.getId());
+			LOGGER.trace("{}", email);
 			throw new MailerException(MailerException.GENERIC_ERROR, e);
 		} catch (final Exception e) {
-			LOGGER.error("Failed to send email:\n{}", email);
+			LOGGER.error("Failed to send email:\n{}", email.getId());
+			LOGGER.trace("{}", email);
 			throw e;
 		}
 	}
 
 	private void logEmail(final MimeMessage message) {
 		if (transportModeLoggingOnly) {
-			LOGGER.info("\n\nEmail: {}\n", email);
-			LOGGER.info("\n\nMimeMessage: {}\n", mimeMessageToEML(message));
+			if (LOGGER.isInfoEnabled()) {
+				LOGGER.info("\n\nEmail: {}\n", email);
+				LOGGER.info("\n\nMimeMessage: {}\n", mimeMessageToEML(message));
+			}
 		} else {
-			LOGGER.trace("\t\nEmail: {}", email);
-			LOGGER.trace("\t\nMimeMessage: {}\n", mimeMessageToEML(message));
+			if (LOGGER.isTraceEnabled()) {
+				LOGGER.trace("\t\nEmail: {}", email);
+				LOGGER.trace("\t\nMimeMessage: {}\n", mimeMessageToEML(message));
+			}
 		}
 	}
 }