From 8865e60e936b57feb1a31d23b29ba0b212492766 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Mon, 14 Jul 2014 10:42:15 +0200
Subject: [PATCH] [Transport] possible NPE during shutdown for requests using
 timeouts

Closes #6849
---
 .../java/org/elasticsearch/transport/TransportService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java
index 3b9893ad121..3491882c6ad 100644
--- a/src/main/java/org/elasticsearch/transport/TransportService.java
+++ b/src/main/java/org/elasticsearch/transport/TransportService.java
@@ -208,7 +208,8 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
             // usually happen either because we failed to connect to the node
             // or because we failed serializing the message
             final RequestHolder holderToNotify = clientHandlers.remove(requestId);
-            if (timeoutHandler != null) {
+            // if the scheduler raise a EsRejectedExecutionException (due to shutdown), we may have a timeout handler, but no future
+            if (timeoutHandler != null && timeoutHandler.future != null) {
                 timeoutHandler.future.cancel(false);
             }