From a6b3145b566fbfa08bbbd2920703b5383f696e31 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Thu, 18 Oct 2018 13:00:59 +0300
Subject: [PATCH] IDEA-168220 Check for empty/null icon URL before accessing
 pool

---
 .../src/com/intellij/tasks/jira/JiraTask.java   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java
index 3d30c7e0db1d..86ecb7624b73 100644
--- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java
+++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java
@@ -3,6 +3,7 @@ package com.intellij.tasks.jira;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.tasks.*;
 import com.intellij.ui.DeferredIconImpl;
+import com.intellij.util.ObjectUtils;
 import icons.TasksCoreIcons;
 import icons.TasksIcons;
 import org.jetbrains.annotations.NotNull;
@@ -71,7 +72,13 @@ public abstract class JiraTask extends Task {
   public final Icon getIcon() {
     if (myIcon == null) {
       // getIconUrl() shouldn't be called before the instance is properly initialized
-      myIcon = new DeferredIconImpl<>(TasksCoreIcons.Jira, getIconUrl(), false, this::getIconByUrl);
+      final String iconUrl = getIconUrl();
+      if (StringUtil.isEmpty(iconUrl)) {
+        myIcon = TasksCoreIcons.Jira;
+      }
+      else {
+        myIcon = new DeferredIconImpl<>(TasksCoreIcons.Jira, iconUrl, false, JiraTask::getIconByUrl);
+      }
     }
     return myIcon;
   }
@@ -100,12 +107,8 @@ public abstract class JiraTask extends Task {
    * @return task con.
    */
   @NotNull
-  protected final Icon getIconByUrl(@Nullable String iconUrl) {
-    if (StringUtil.isEmpty(iconUrl)) {
-      return TasksCoreIcons.Jira;
-    }
-    Icon icon = CachedIconLoader.getIcon(iconUrl);
-    return icon != null ? icon : TasksIcons.Other;
+  protected static Icon getIconByUrl(@Nullable String iconUrl) {
+    return ObjectUtils.notNull(CachedIconLoader.getIcon(iconUrl), TasksIcons.Other);
   }
 
   /**