#151: don't overwrite given filename extension

Author: bbottema

src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper.java

@@ -263,7 +263,7 @@ static String determineResourceName(final AttachmentResource attachmentResource,
 		if (includeExtension && !valueNullOrEmpty(datasourceName)) {
 			@SuppressWarnings("UnnecessaryLocalVariable") final
 			String possibleFilename = datasourceName;
-			if (possibleFilename.contains(".")) {
+			if (!resourceName.contains(".") && possibleFilename.contains(".")) {
 				final String extension = possibleFilename.substring(possibleFilename.lastIndexOf("."), possibleFilename.length());
 				if (!resourceName.endsWith(extension)) {
 					resourceName += extension;

src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelperTest.java

@@ -82,6 +82,14 @@ public void determineResourceName7()
 		assertThat(MimeMessageHelper.determineResourceName(resource7, true)).isEqualTo("the resource.txt");
 	}
 
+	@Test
+	public void determineResourceName_ignoreExtensionFromResource()
+			throws IOException {
+		AttachmentResource resource7 = new AttachmentResource("the resource.txt", getDataSource("blahblah.1/www/get?id=3"));
+		assertThat(MimeMessageHelper.determineResourceName(resource7, false)).isEqualTo("the resource.txt");
+		assertThat(MimeMessageHelper.determineResourceName(resource7, true)).isEqualTo("the resource.txt");
+	}
+	
 	private ByteArrayDataSource getDataSource(String name)
 			throws IOException {
 		ByteArrayDataSource ds = new ByteArrayDataSource("", "text/text");