Merge pull request #170 from jenkinsci/fix-missing-userproperty

fix NPE when UserHeader not found
jenkinsci · Jan 3, 2025 · 9c8d868 · 9c8d868
2 parents 28534dc + 5f3fffe
commit 9c8d868
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/io/jenkins/plugins/customizable_header/CustomHeaderConfiguration.java b/src/main/java/io/jenkins/plugins/customizable_header/CustomHeaderConfiguration.java
@@ -221,7 +221,9 @@ private boolean hasUserLinks() {
     User user = User.current();
     if (user != null) {
       UserHeader userHeader = user.getProperty(UserHeader.class);
-      return userHeader.getLinks() != null && userHeader.getLinks().size() != 0;
+      if (userHeader != null) {
+        return userHeader.getLinks() != null && userHeader.getLinks().size() != 0;
+      }
     }
     return false;
   }
@@ -235,7 +237,9 @@ public List<AbstractLink> getUserLinks() {
     List<AbstractLink> links = null;
     if (user != null) {
       UserHeader userHeader = user.getProperty(UserHeader.class);
-      links = userHeader.getLinks();
+      if (userHeader != null) {
+        links = userHeader.getLinks();
+      }
     }
     if (links != null) {
       return links;