From 0cb97e404482c2023d6f9166d82f0ec338eff1f2 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Wed, 21 Jul 2010 16:38:37 +0300
Subject: [PATCH] cancel the timeout in any case

---
 .../java/org/elasticsearch/search/internal/SearchContext.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
index f18f94942cb..adf8a84cb49 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
@@ -144,9 +144,7 @@ public class SearchContext implements Releasable {
             // ignore this as well
         }
         engineSearcher.release();
-        if (!keepAliveTimeout.isCancelled()) {
-            keepAliveTimeout.cancel();
-        }
+        keepAliveTimeout.cancel();
         return true;
     }