svn commit: r1801389 - in /commons/proper/email/trunk/src: main/java/org/apache/commons/mail/EmailUtils.java test/java/org/apache/commons/mail/EmailTest.java test/java/org/apache/commons/mail/EmailUtilsTest.java

[ggregory]

Author: ggregory
Date: Sun Jul  9 20:37:07 2017
New Revision: 1801389

URL: http://svn.apache.org/viewvc?rev=1801389&view=rev
Log:
Make code null-safe.

Modified:
    
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
    
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
    
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailUtilsTest.java

Modified: 
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java?rev=1801389&r1=1801388&r2=1801389&view=diff
==============================================================================
--- 
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
 (original)
+++ 
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailUtils.java
 Sun Jul  9 20:37:07 2017
@@ -276,7 +276,7 @@ final class EmailUtils
      * @return a clean string
      */
     static String replaceEndOfLineCharactersWithSpaces(final String input) {
-        return input.replace('\n', ' ').replace('\r', ' ');
+        return input == null ? null : input.replace('\n', ' ').replace('\r', ' 
');
     }
     
     /**

Modified: 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java?rev=1801389&r1=1801388&r2=1801389&view=diff
==============================================================================
--- 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java 
(original)
+++ 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.java 
Sun Jul  9 20:37:07 2017
@@ -984,6 +984,7 @@ public class EmailTest extends AbstractE
             email.setSubject(invalidChar);
             assertNotEquals(invalidChar, email.getSubject());
         }
+        assertEquals(null, email.setSubject(null).getSubject());
         assertEquals("abcdefg", email.setSubject("abcdefg").getSubject());
         assertEquals("abc defg", email.setSubject("abc\rdefg").getSubject());
         assertEquals("abc defg", email.setSubject("abc\ndefg").getSubject());

Modified: 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailUtilsTest.java?rev=1801389&r1=1801388&r2=1801389&view=diff
==============================================================================
--- 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
 (original)
+++ 
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
 Sun Jul  9 20:37:07 2017
@@ -32,6 +32,7 @@ public class EmailUtilsTest {
 
     @Test
     public void testClearEndOfLineCharacters() {
+        assertEquals(null, 
EmailUtils.replaceEndOfLineCharactersWithSpaces(null));
         assertEquals("abcdefg", 
EmailUtils.replaceEndOfLineCharactersWithSpaces("abcdefg"));
         assertEquals("abc defg", 
EmailUtils.replaceEndOfLineCharactersWithSpaces("abc\rdefg"));
         assertEquals("abc defg", 
EmailUtils.replaceEndOfLineCharactersWithSpaces("abc\ndefg"));