From 45100288a8364134e904fdf0438b964ce1a57d44 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 19 May 2014 13:50:11 +0200
Subject: [PATCH] OO-988: fix NPE if the settings are empty
---
.../org/olat/admin/user/tools/UserToolsModule.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/tools/UserToolsModule.java b/src/main/java/org/olat/admin/user/tools/UserToolsModule.java
index cb57dcacfd4..c4ce3a5d05f 100644
--- a/src/main/java/org/olat/admin/user/tools/UserToolsModule.java
+++ b/src/main/java/org/olat/admin/user/tools/UserToolsModule.java
@@ -106,11 +106,17 @@ public class UserToolsModule extends AbstractOLATModule {
return availableUserTools;
}
+ /**
+ * Empty set is the same as all tools are available.
+ * @return
+ */
public Set<String> getAvailableUserToolSet() {
- String[] tools = availableUserTools.split(",");
Set<String> toolSet = new HashSet<>();
- for(String tool:tools) {
- toolSet.add(tool);
+ if(StringHelper.containsNonWhitespace(availableUserTools)) {
+ String[] tools = availableUserTools.split(",");
+ for(String tool:tools) {
+ toolSet.add(tool);
+ }
}
return toolSet;
}
--
GitLab