moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Fix NPE in Address.Parse

Browse Source 
Found by FindBugs.  Also avoid an allocation in the uncommon case.
This commit is contained in:
Andrew Gaul 2011-10-25 20:33:18 -07:00
parent 47a4bd77ad
commit ad5676ed28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/fsck/k9/mail/Address.java
View File

@ -131,10 +131,10 @@ public class Address {
* @return An array of 0 or more Addresses. * @return An array of 0 or more Addresses.
*/ */
public static Address[] parse(String addressList) { public static Address[] parse(String addressList) {
ArrayList<Address> addresses = new ArrayList<Address>(); if (addressList == null || addressList.isEmpty()) {
if ((addressList == null) && !("".equals(addressList))) {
return EMPTY_ADDRESS_ARRAY; return EMPTY_ADDRESS_ARRAY;
} }
List<Address> addresses = new ArrayList<Address>();
try { try {
MailboxList parsedList = AddressBuilder.parseAddressList(addressList).flatten(); MailboxList parsedList = AddressBuilder.parseAddressList(addressList).flatten();
for (int i = 0, count = parsedList.size(); i < count; i++) { for (int i = 0, count = parsedList.size(); i < count; i++) {