Merge branch 'fred84-imap_attachement_filename_fix'

Author: bshannon

doc/release/CHANGES.txt

@@ -31,6 +31,7 @@ GH  321	URLName.getURL() returns incorrect url.
 GH  322	Dots in local part of emails not handled properly
 GH  323	Support loading protocol providers using ServiceLoader
 GH  326	Apply relaxed Content-Disposition parsing to Content-Disposition params
+GH  330	Attachment filename is ignored
 GH  332	http proxy support should support authenticating to the proxy server
 
 

mail/src/main/java/com/sun/mail/imap/IMAPBodyPart.java

@@ -168,7 +168,7 @@ public String getFileName() throws MessagingException {
 	String filename = null;
 	if (bs.dParams != null)
 	    filename = bs.dParams.get("filename");
-	if (filename == null && bs.cParams != null)
+	if ((filename == null || filename.isEmpty()) && bs.cParams != null)
 	    filename = bs.cParams.get("name");
 	if (decodeFileName && filename != null) {
 	    try {

mail/src/test/java/com/sun/mail/imap/IMAPMessageTest.java

@@ -178,6 +178,33 @@ else if (line.indexOf("BODY[TEXT]") >= 0)
 	    });
     }
 
+    @Test
+    public void testAttachementFileName() {
+        testWithHandler(
+                new IMAPTest() {
+                    @Override
+                    public void test(Folder folder, IMAPHandlerMessage handler) throws MessagingException, IOException {
+                        Message m = folder.getMessage(1);
+                        Multipart mp = (Multipart)m.getContent();
+                        BodyPart bp = mp.getBodyPart(1);
+                        assertEquals("filename.csv", MimeUtility.decodeText(bp.getFileName()));
+                    }
+                },
+                new IMAPHandlerMessage() {
+                    @Override
+                    public void fetch(String line) throws IOException {
+                        untagged("1 FETCH (BODYSTRUCTURE (" +
+                                "(\"text\" \"html\" (\"charset\" \"utf-8\") NIL NIL \"base64\" 402 6 NIL NIL NIL NIL)" +
+                                "(\"application\" \"octet-stream\" (\"name\" \"=?utf-8?B?ZmlsZW5hbWU=?= =?utf-8?B?LmNzdg==?=\") NIL NIL \"base64\" 658 NIL " +
+                                "(\"attachment\" (\"filename\" \"\")) NIL NIL) \"mixed\" " +
+                                "(\"boundary\" \"--boundary_539_27806e16-2599-4612-b98a-69335bedd206\") NIL NIL NIL))"
+                        );
+                        ok();
+                    }
+                }
+        );
+    }
+
     /**
      * Test that returning NIL instead of an empty string for the content
      * of an empty body part works correctly.