Skip to content
Snippets Groups Projects
Commit afd0fdf3 authored by srosse's avatar srosse
Browse files

OO-1263: fix NPE if the upgrader run against an older instance than 10.0

parent 69299142
No related branches found
No related tags found
No related merge requests found
......@@ -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",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment