[FIXED JENKINS-50795] Add null safety checks to FixedSet

slgriff · slgriff · commit 4a1667146d09 · 2018-09-08T10:01:43.000-04:00
diff --git a/core/src/main/java/hudson/search/FixedSet.java b/core/src/main/java/hudson/search/FixedSet.java
@@ -50,7 +50,7 @@ public void find(String token, List<SearchItem> result) {
         boolean caseInsensitive = UserSearchProperty.isCaseInsensitive();
         for (SearchItem i : items) {
             String name = i.getSearchName();
-            if (name.equals(token) || (caseInsensitive && name.equalsIgnoreCase(token))) {
+            if (name != null && (name.equals(token) || (caseInsensitive && name.equalsIgnoreCase(token)))) {
                 result.add(i);
             }
         }
@@ -60,7 +60,7 @@ public void suggest(String token, List<SearchItem> result) {
         boolean caseInsensitive = UserSearchProperty.isCaseInsensitive();
         for (SearchItem i : items) {
             String name = i.getSearchName();
-            if (name.contains(token) || (caseInsensitive && StringUtils.containsIgnoreCase(name, token))) {
+            if (name != null && (name.contains(token) || (caseInsensitive && StringUtils.containsIgnoreCase(name, token)))) {
                 result.add(i);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void find(String token, List<SearchItem> result) {`
`50`	`50`	`boolean caseInsensitive = UserSearchProperty.isCaseInsensitive();`
`51`	`51`	`for (SearchItem i : items) {`
`52`	`52`	`String name = i.getSearchName();`
`53`		`- if (name.equals(token) \|\| (caseInsensitive && name.equalsIgnoreCase(token))) {`
	`53`	`+ if (name != null && (name.equals(token) \|\| (caseInsensitive && name.equalsIgnoreCase(token)))) {`
`54`	`54`	`result.add(i);`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -60,7 +60,7 @@ public void suggest(String token, List<SearchItem> result) {`
`60`	`60`	`boolean caseInsensitive = UserSearchProperty.isCaseInsensitive();`
`61`	`61`	`for (SearchItem i : items) {`
`62`	`62`	`String name = i.getSearchName();`
`63`		`- if (name.contains(token) \|\| (caseInsensitive && StringUtils.containsIgnoreCase(name, token))) {`
	`63`	`+ if (name != null && (name.contains(token) \|\| (caseInsensitive && StringUtils.containsIgnoreCase(name, token)))) {`
`64`	`64`	`result.add(i);`
`65`	`65`	`}`
`66`	`66`	`}`