garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

return an error message when feed/category is not found instead of returning an empty feed/category

Browse Source
This commit is contained in:
Athou
2013-08-30 15:52:31 +02:00
parent 6560fc9d05
commit dfcc4eeebd
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -170,8 +170,9 @@ public class CategoryREST extends AbstractREST {
.isImageProxyEnabled()));
}
entries.setName(parent.getName());
} else {
return Response.status(Status.NOT_FOUND).entity("<message>category not found</message>").build();
}
}
boolean hasMore = entries.getEntries().size() > limit;
@@ -200,7 +201,11 @@ public class CategoryREST extends AbstractREST {
int offset = 0;
int limit = 20;
Entries entries = (Entries) getCategoryEntries(id, readType, null, offset, limit, order, null, false, null).getEntity();
Response response = getCategoryEntries(id, readType, null, offset, limit, order, null, false, null);
if (response.getStatus() != Status.OK.getStatusCode()) {
return response;
}
Entries entries = (Entries) response.getEntity();
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");

8
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -181,6 +181,8 @@ public class FeedREST extends AbstractREST {
entries.setHasMore(true);
entries.getEntries().remove(entries.getEntries().size() - 1);
}
} else {
return Response.status(Status.NOT_FOUND).entity("<message>feed not found</message>").build();
}
entries.setTimestamp(System.currentTimeMillis());
@@ -202,7 +204,11 @@ public class FeedREST extends AbstractREST {
int offset = 0;
int limit = 20;
Entries entries = (Entries) getFeedEntries(id, readType, null, offset, limit, order, null, false).getEntity();
Response response = getFeedEntries(id, readType, null, offset, limit, order, null, false);
if (response.getStatus() != Status.OK.getStatusCode()) {
return response;
}
Entries entries = (Entries) response.getEntity();
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");