Skip to content
Snippets Groups Projects
Commit a9841644 authored by srosse's avatar srosse
Browse files

OO-780: hardened the blog against concurrent delete and click

parent a0c18818
No related branches found
No related tags found
No related merge requests found
......@@ -261,6 +261,7 @@ public class ItemsController extends BasicController implements Activateable2 {
* @param item
*/
private void createCommentsAndRatingsLink(UserRequest ureq, Feed feed, Item item) {
if(feed == null || item == null) return;//check against concurrent changes
if (CoreSpringFactory.containsBean(CommentAndRatingService.class)) {
if(commentsLinks == null) {
commentsLinks = new HashMap<Item,Controller>();
......@@ -430,8 +431,9 @@ public class ItemsController extends BasicController implements Activateable2 {
Item item = (Item) ((Link) source).getUserObject();
// Reload first, could be stale
item = feedManager.getItem(feed, item.getGuid());
displayItemController(ureq, item);
if(item != null) {
displayItemController(ureq, item);
}
} else if (source == makeInternalButton) {
if (feed.isUndefined()) {
feedManager.updateFeedMode(Boolean.FALSE, feed);
......@@ -697,9 +699,12 @@ public class ItemsController extends BasicController implements Activateable2 {
if (event == UserCommentsAndRatingsController.EVENT_COMMENT_LINK_CLICKED) {
// go to details page
Item item = (Item) commentsRatingsCtr.getUserObject();
ItemController myItemCtr = displayItemController(ureq, item);
List<ContextEntry> entries = BusinessControlFactory.getInstance().createCEListFromResourceType(ItemController.ACTIVATION_KEY_COMMENTS);
myItemCtr.activate(ureq, entries, null);
item = feedManager.getItem(feed, item.getGuid());
if(item != null) {
ItemController myItemCtr = displayItemController(ureq, item);
List<ContextEntry> entries = BusinessControlFactory.getInstance().createCEListFromResourceType(ItemController.ACTIVATION_KEY_COMMENTS);
myItemCtr.activate(ureq, entries, null);
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment