From eecffb86d52e2319bec98aafda9d5a95b29f82d1 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 5 Mar 2015 08:49:48 +0100
Subject: [PATCH] OO-1458: the root node can be null, add check
---
src/main/java/org/olat/course/MergedCourseContainer.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/olat/course/MergedCourseContainer.java b/src/main/java/org/olat/course/MergedCourseContainer.java
index 14be0d5958c..f6a24e1e145 100644
--- a/src/main/java/org/olat/course/MergedCourseContainer.java
+++ b/src/main/java/org/olat/course/MergedCourseContainer.java
@@ -123,6 +123,8 @@ public class MergedCourseContainer extends MergeSource {
}
private void addFolderBuildingBlocks(PersistingCourseImpl course, MergeSource nodesContainer, TreeNode courseNode) {
+ if(courseNode == null) return;
+
for (int i = 0; i < courseNode.getChildCount(); i++) {
TreeNode child = (TreeNode)courseNode.getChildAt(i);
--
GitLab