Message.setRecipient(type, null) should remove recipients - bug 7536

Author: bshannon

doc/release/CHANGES.txt

@@ -36,6 +36,7 @@ K  7506	MailHandler verify should load additional content handlers
 K  7512	NullPointerException if SASL is enabled on Android
 K  7513	write timeouts don't work with SSL on Android
 K  7529	JavaMail allows injection of unwanted headers
+K  7536	Message.setRecipient(type, null) should remove recipients
 
 
 		  CHANGES IN THE 1.5.5 RELEASE

mail/src/main/java/javax/mail/Message.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -374,9 +374,13 @@ public abstract void setRecipients(RecipientType type, Address[] addresses)
      */
     public void setRecipient(RecipientType type, Address address)
                                 throws MessagingException {
-	Address[] a = new Address[1];
-	a[0] = address;
-	setRecipients(type, a);
+	if (address == null)
+	    setRecipients(type, null);
+	else {
+	    Address[] a = new Address[1];
+	    a[0] = address;
+	    setRecipients(type, a);
+	}
     }
 
     /**

mail/src/test/java/javax/mail/internet/MimeMessageTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -81,6 +81,20 @@ public void testSetRecipientsStringNull() throws Exception {
 	assertArrayEquals("To: is removed", null, m.getRecipients(TO));
     }
 
+    /**
+     * Test that setRecipient with a null string address removes the header.
+     * (Bug 7536)
+     */
+    @Test
+    public void testSetRecipientStringNull() throws Exception {
+	String addr = "joe@example.com";
+	MimeMessage m = new MimeMessage(s);
+	m.setRecipient(TO, new InternetAddress(addr));
+	assertEquals("To: is set", addr, m.getRecipients(TO)[0].toString());
+	m.setRecipient(TO, (Address)null);
+	assertArrayEquals("To: is removed", null, m.getRecipients(TO));
+    }
+
     /**
      * Test that copying a DataHandler from one message to another
      * has the desired effect.