diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java index dd499db..0db4500 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java @@ -1040,9 +1040,13 @@ public class NewsFeedPanel extends Composite { * @param quantity */ public void loadMorePosts(final int quantity, boolean isSortingByLastCommentedposts) { - if (isSortingByLastCommentedposts) - showLoader(); int from = (fromStartingPoint == null) ? allUpdates.size()+1 : fromStartingPoint; + if (isSortingByLastCommentedposts) { + showLoader(); + if ((from == 0)) + from = 1; + } + GWT.log("StartingPoint = " + from); newsService.getMoreFeeds(from, quantity, new AsyncCallback() { @Override diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java index 227e823..b0396f3 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java @@ -51,7 +51,7 @@ public class FilterPanel extends Composite { allUpdatesLink.setActive(false); recentCommentsLink.setActive(true); caller.setCurrentFilter(FilterType.RECENT_COMMENTS); - int loadedPostsInView = caller.getAllUpdatesSize(); + int loadedPostsInView = caller.getAllUpdatesSize() + 1; int quantity = loadedPostsInView < 100 ? 100 - loadedPostsInView : loadedPostsInView; caller.loadMorePosts(quantity, true); } diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java index 6cf8958..a5a81aa 100644 --- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java @@ -104,7 +104,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService private ElasticSearchClient escl; private final static int MAX_POSTS_NO = 30; - + public void init() { store = new DBCassandraAstyanaxImpl(); try { @@ -494,9 +494,11 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService try { rangeFeeds = store.getRecentFeedsByVREAndRange(vreid, start, quantity); organizationFeeds = rangeFeeds.getFeeds(); - for (Feed feed : organizationFeeds) { - feedsMap.put(feed.getKey(), feed); - //System.out.println("->\n"+feed.getDescription()); + if (organizationFeeds != null) { + for (Feed feed : organizationFeeds) { + feedsMap.put(feed.getKey(), feed); + //System.out.println("->\n"+feed.getDescription()); + } } } catch (Exception e) {