OO-726: delete bookmarks while deleting a course, hardened bookmarks list against zombies bookmarks

src/main/java/org/olat/core/commons/services/mark/ui/BookmarksController.java

@@ -166,7 +166,11 @@ public class BookmarksController extends BasicController {
 
 		for(Mark mark:items) {
 			RepositoryEntry repositoryEntry = keyToRepositoryEntryMap.get(mark.getOLATResourceable().getResourceableId());
-			convertedList.add(new Bookmark(mark, repositoryEntry));
+			if(repositoryEntry != null) {
+				convertedList.add(new Bookmark(mark, repositoryEntry));
+			} else {
+				markManager.removeMark(mark);
+			}
 		}
 		return convertedList;
 	}

src/main/java/org/olat/repository/RepositoryManager.java

@@ -56,6 +56,7 @@ import org.olat.core.commons.persistence.DB;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.commons.persistence.DBQuery;
 import org.olat.core.commons.persistence.PersistenceHelper;
+import org.olat.core.commons.services.mark.MarkManager;
 import org.olat.core.commons.services.mark.impl.MarkImpl;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.WindowControl;
@@ -391,7 +392,7 @@ public class RepositoryManager extends BasicManager {
 		userCourseInformationsManager.deleteUserCourseInformations(entry);
 		
 		// delete all bookmarks referencing deleted entry
-		//TODO bookmark BookmarkManager.getInstance().deleteAllBookmarksFor(entry);
+		CoreSpringFactory.getImpl(MarkManager.class).deleteMarks(entry);
 		// delete all catalog entries referencing deleted entry
 		CatalogManager.getInstance().resourceableDeleted(entry);