From 287dea2d361b3407036a8f4e560cda06ea720ab8 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 14 Oct 2013 07:41:19 +0200 Subject: [PATCH] use tag for feed name is available --- .../com/commafeed/frontend/rest/resources/CategoryREST.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java index 0b5622a9..951d5fed 100644 --- a/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java +++ b/src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java @@ -22,7 +22,7 @@ import javax.ws.rs.core.Response.Status; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang.StringUtils; import com.commafeed.backend.cache.CacheService; @@ -136,7 +136,7 @@ public class CategoryREST extends AbstractREST { } if (ALL.equals(id)) { - entries.setName("All"); + entries.setName(ObjectUtils.defaultIfNull(tag, "All")); List subs = feedSubscriptionDAO.findAll(getUser()); removeExcludedSubscriptions(subs, excludedIds); List list = feedEntryStatusDAO.findBySubscriptions(getUser(), subs, unreadOnly, keywords, newerThanDate,