#318: allow attachments with empty data (even though this is invalid, but we can't just ignore the source material, like an outlook message conversion)

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -87,6 +87,7 @@
 import static org.simplejavamail.email.internal.EmailException.ERROR_RESOLVING_IMAGE_DATASOURCE;
 import static org.simplejavamail.email.internal.EmailException.NAME_MISSING_FOR_EMBEDDED_IMAGE;
 import static org.simplejavamail.internal.smimesupport.SmimeRecognitionUtil.isGeneratedSmimeMessageId;
+import static org.simplejavamail.internal.util.MiscUtil.checkNotNull;
 import static org.simplejavamail.internal.util.MiscUtil.defaultTo;
 import static org.simplejavamail.internal.util.MiscUtil.extractEmailAddresses;
 import static org.simplejavamail.internal.util.MiscUtil.randomCid10;
@@ -1681,7 +1682,7 @@ public EmailPopulatingBuilder withHeader(@NotNull final String name, @Nullable f
 	 */
 	@Override
 	public EmailPopulatingBuilder withAttachment(@Nullable final String name, @NotNull final byte[] data, @NotNull final String mimetype) {
-		checkNonEmptyArgument(data, "data");
+		checkNotNull(data, "data");
 		checkNonEmptyArgument(mimetype, "mimetype");
 		final ByteArrayDataSource dataSource = new ByteArrayDataSource(data, mimetype);
 		dataSource.setName(name);

modules/simple-java-mail/src/test/java/org/simplejavamail/converter/EmailConverterTest.java

@@ -102,4 +102,12 @@ public void testAttachmentSize() {
 			assertThat(attachment.getName()).isEqualTo("ForwardedMessage.eml");
 		}
 	}
+	
+	@Test
+	public void testOutlookMessageWithEmptyAttachments() {
+		Email s1 = EmailConverter.outlookMsgToEmail(new File(RESOURCE_TEST_MESSAGES + "/#318 Email with nodata-attachment.msg"));
+		assertThat(s1.getAttachments()).extracting("name").containsExactlyInAnyOrder("ecblank.gif", "logo_imabenelux.jpg");
+		Email s2 = EmailConverter.outlookMsgToEmail(new File(RESOURCE_TEST_MESSAGES + "/#318 Email with nodata-attachment2.msg"));
+		assertThat(s2.getAttachments()).extracting("name").containsExactlyInAnyOrder("ETS Andre Glotz SA CP 1.doc");
+	}
 }