From 145a2e283a942dd3ea9f5e049f1a5f7a38ec9a75 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 21 Sep 2017 09:35:55 +0200
Subject: [PATCH] OO-3026: check if the node exists in the catalog activation
 method

---
 .../olat/repository/ui/catalog/CatalogManagerController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
index e870a22832a..5b5a7865508 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
@@ -85,7 +85,7 @@ public class CatalogManagerController extends BasicController implements Activat
 			Long entryKey = entry.getOLATResourceable().getResourceableId();
 			if(entryKey != null && entryKey.longValue() > 0) {
 				List<ContextEntry> parentLine = new ArrayList<>();
-				for(CatalogEntry node = catalogManager.getCatalogEntryByKey(entryKey); node.getParent() != null; node=node.getParent()) {
+				for(CatalogEntry node = catalogManager.getCatalogEntryByKey(entryKey); node != null && node.getParent() != null; node=node.getParent()) {
 					OLATResourceable nodeRes = OresHelper.createOLATResourceableInstance("Node", node.getKey());
 					ContextEntry ctxEntry = BusinessControlFactory.getInstance().createContextEntry(nodeRes);
 					ctxEntry.setTransientState(new CatalogStateEntry(node));
-- 
GitLab