Another GUI NPE fix.

Evolveum · Nov 6, 2017 · 385a9e3 · 385a9e3
1 parent 909251c
commit 385a9e3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -356,9 +356,10 @@ private PrismObject<UserType> loadUser() {
     private List<RichHyperlinkType> loadLinksList() {
         PrismObject<UserType> user = principalModel.getObject();
         if (user == null) {
-            return new ArrayList<RichHyperlinkType>();
+            return new ArrayList<>();
         } else {
-            return ((PageBase)getPage()).loadAdminGuiConfiguration().getUserDashboardLink();
+            AdminGuiConfigurationType adminGuiConfig = ((PageBase) getPage()).loadAdminGuiConfiguration();
+            return adminGuiConfig != null ? adminGuiConfig.getUserDashboardLink() : new ArrayList<>();
         }
     }