Merge OpenOLAT default braanch to OpenOLAT aabsence with 5e8bc18129a7cafbf9fbb87837a8e5876f98efac

src/main/java/org/olat/course/run/CourseRuntimeController.java

@@ -452,7 +452,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 			tools.setI18nKey("header.tools");
 			tools.setElementCssClass("o_sel_course_tools");
 
-			if (reSecurity.isEntryAdmin() || hasCourseRight(CourseRights.RIGHT_COURSEEDITOR)) {
+			if (uce != null && (reSecurity.isEntryAdmin() || hasCourseRight(CourseRights.RIGHT_COURSEEDITOR))) {
 				boolean managed = RepositoryEntryManagedFlag.isManaged(getRepositoryEntry(), RepositoryEntryManagedFlag.editcontent);
 				boolean readOnly = uce.isCourseReadOnly();
 				editLink = LinkFactory.createToolLink("edit.cmd", translate("command.openeditor"), this, "o_icon_courseeditor");

src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java

@@ -364,7 +364,11 @@ public class FeedFileStorge {
 		if (itemContainer != null) {
 			VFSLeaf leaf = (VFSLeaf) itemContainer.resolve(ITEM_FILE_NAME);
 			if (leaf != null) {
-				item = (ItemImpl) XStreamHelper.readObject(xstream, leaf.getInputStream());
+				try {
+					item = (ItemImpl) XStreamHelper.readObject(xstream, leaf.getInputStream());
+				} catch (Exception e) {
+					log.error("Item XML-File could not be read. Item container: " + leaf);
+				}
 			} else {
 				log.error("Item XML-File could not be found on file system."
 						+ " Item container: " + itemContainer.getName());

src/main/java/org/olat/modules/webFeed/manager/FeedNotificationsHandler.java

@@ -69,7 +69,7 @@ public abstract class FeedNotificationsHandler implements NotificationsHandler {
 	
 	@Override
 	public SubscriptionInfo createSubscriptionInfo(Subscriber subscriber, Locale locale, Date compareDate) {
-		SubscriptionInfo si = null;
+		SubscriptionInfo si;
 		Publisher p = subscriber.getPublisher();
 		Date latestNews = p.getLatestNewsDate();
 		
@@ -104,7 +104,10 @@ public abstract class FeedNotificationsHandler implements NotificationsHandler {
 					}
 				}
 				si = new SubscriptionInfo(subscriber.getKey(), p.getType(),	new TitleItem(title, getCssClassIcon()), items);
-		 	}
+		 	} else {
+				//no news
+				si = notificationsManager.getNoSubscriptionInfo();
+			}
 		} catch (Exception e) {
 			log.error("Unknown Exception", e);
 			si = notificationsManager.getNoSubscriptionInfo();