aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-09-14 13:33:29 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-09-14 13:33:29 +0200
commit477f248f471ea9da6617743801faaf5fadef3ab6 (patch)
tree1f78ec9129c07836fef2ab184fc4bead905fad79 /main
parente098903e6f1d64eda501ab5fe0158e72152e895c (diff)
parent3e5192d701c76894c38eb82f2c1df31fe4f9fb7e (diff)
downloadcgeo-477f248f471ea9da6617743801faaf5fadef3ab6.zip
cgeo-477f248f471ea9da6617743801faaf5fadef3ab6.tar.gz
cgeo-477f248f471ea9da6617743801faaf5fadef3ab6.tar.bz2
Merge branch 'release' into upstream
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCParser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index 24ee7af..4a07302 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -34,8 +34,8 @@ import cgeo.geocaching.utils.MatcherWrapper;
import cgeo.geocaching.utils.TextUtils;
import ch.boye.httpclientandroidlib.HttpResponse;
-
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
@@ -1656,7 +1656,7 @@ public abstract class GCParser {
public static List<LogType> parseTypes(String page) {
if (StringUtils.isEmpty(page)) {
- return null;
+ return ListUtils.EMPTY_LIST;
}
final List<LogType> types = new ArrayList<LogType>();