From e724d828dad588fe515ddf557a8e8b9de104dd7f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 6 May 2013 10:54:14 +0200
Subject: [PATCH] no-jira: fix poential NPE in bookmarks portlet, set version
8.4.0
---
.../services/mark/ui/BookmarksPortletRunController.java | 4 +++-
src/main/resources/serviceconfig/olat.properties | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
index d31de3a1e83..1d12fd848dc 100644
--- a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
+++ b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
@@ -166,7 +166,9 @@ public class BookmarksPortletRunController extends AbstractPortletRunController<
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));
+ }
}
return convertedList;
}
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 8784d6ad2ef..6c55dc0e7ac 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -783,7 +783,7 @@ ldap.attrib.sync.once.olatkey3=
# Build properties
#####
application.name=OpenOLAT
-build.version=8.4.0b
+build.version=8.4.0
build.identifier=openolat840-dev
build.repo.revision=local-devel
--
GitLab