From afd0fdf34d4fd4e95ce99ef1948cd0dd16ba462e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 1 Dec 2014 08:56:04 +0100
Subject: [PATCH] OO-1263: fix NPE if the upgrader run against an older
instance than 10.0
---
src/main/java/org/olat/upgrade/OLATUpgrade_10_1_0.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_10_1_0.java b/src/main/java/org/olat/upgrade/OLATUpgrade_10_1_0.java
index 362b86f9207..96b19bc559e 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_10_1_0.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_10_1_0.java
@@ -89,7 +89,7 @@ public class OLATUpgrade_10_1_0 extends OLATUpgrade {
if (!uhd.getBooleanDataValue(TASK_USER_TOOLS)) {
try {
String tools = userToolsModule.getAvailableUserTools();
- StringBuilder toolsSb = new StringBuilder(tools);
+ StringBuilder toolsSb = new StringBuilder(tools == null ? "" : tools);
String[] defaultUserTools = new String[]{
"org.olat.home.HomeMainController:org.olat.gui.control.PrintUserToolExtension",
"org.olat.home.HomeMainController:org.olat.gui.control.SearchUserToolExtension",
@@ -107,7 +107,7 @@ public class OLATUpgrade_10_1_0 extends OLATUpgrade {
userToolsModule.setAvailableUserTools(toolsSb.toString());
String defPreset = userToolsModule.getDefaultPresetOfUserTools();
- StringBuilder defPresetSb = new StringBuilder(defPreset);
+ StringBuilder defPresetSb = new StringBuilder(defPreset == null ? "" : defPreset);
String[] defaultPresets = new String[]{
"org.olat.home.HomeMainController:org.olat.gui.control.PrintUserToolExtension",
"org.olat.home.HomeMainController:org.olat.gui.control.HelpUserToolExtension",
--
GitLab