From 35f6496694a6bd71977765e0ebfa09ba8fc09854 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Thu, 12 Feb 2015 15:50:12 +0100
Subject: [PATCH] Internal: Pending Task listing should account for task being
 nulled

This caused by #9671 and #9621 working together and cause an NPE
---
 .../cluster/service/InternalClusterService.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
index 8e1ce7a0e2c..156e2e1277a 100644
--- a/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
+++ b/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
@@ -296,12 +296,16 @@ public class InternalClusterService extends AbstractLifecycleComponent<ClusterSe
         for (PrioritizedEsThreadPoolExecutor.Pending pending : pendings) {
             final String source;
             final long timeInQueue;
-            if (pending.task instanceof TimedPrioritizedRunnable) {
-                TimedPrioritizedRunnable runnable = (TimedPrioritizedRunnable) pending.task;
+            // we have to capture the task as it will be nulled after execution and we don't want to change while we check things here.
+            final Object task = pending.task;
+            if (task == null) {
+                continue;
+            } else if (task instanceof TimedPrioritizedRunnable) {
+                TimedPrioritizedRunnable runnable = (TimedPrioritizedRunnable) task;
                 source = runnable.source();
                 timeInQueue = runnable.timeSinceCreatedInMillis();
             } else {
-                assert false : "expected TimedPrioritizedRunnable got " + pending.task.getClass();
+                assert false : "expected TimedPrioritizedRunnable got " + task.getClass();
                 source = "unknown";
                 timeInQueue = 0;
             }