Fix null string in Location.uniqueShortName()

This commit is contained in:
Andreas Schildbach 2013-10-12 19:31:29 +02:00
parent 6ea46a8fe9
commit 75be137e40

View file

@ -123,7 +123,7 @@ public final class Location implements Serializable
public final String uniqueShortName()
{
if (name != null && Arrays.binarySearch(NON_UNIQUE_NAMES, name) >= 0)
if (place != null && name != null && Arrays.binarySearch(NON_UNIQUE_NAMES, name) >= 0)
return place + ", " + name;
else if (name != null)
return name;