From e0058ff80d1109c2a3b59e7ae62e2d74cfb95c66 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Thu, 8 Apr 2010 13:58:00 +0300
Subject: [PATCH] release before we notify the user

---
 .../search/type/TransportSearchDfsQueryThenFetchAction.java     | 2 +-
 .../action/search/type/TransportSearchQueryThenFetchAction.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
index f164f41d84e..13581b8ed75 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
@@ -171,8 +171,8 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
             final Map<SearchShardTarget, ExtTIntArrayList> docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList);
 
             if (docIdsToLoad.isEmpty()) {
-                finishHim();
                 releaseIrrelevantSearchContexts(queryResults, docIdsToLoad);
+                finishHim();
             }
 
             final AtomicInteger counter = new AtomicInteger(docIdsToLoad.size());
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
index ded3b86406e..adcc6f5b5b1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
@@ -85,8 +85,8 @@ public class TransportSearchQueryThenFetchAction extends TransportSearchTypeActi
             final Map<SearchShardTarget, ExtTIntArrayList> docIdsToLoad = searchPhaseController.docIdsToLoad(sortedShardList);
 
             if (docIdsToLoad.isEmpty()) {
-                finishHim();
                 releaseIrrelevantSearchContexts(queryResults, docIdsToLoad);
+                finishHim();
             }
 
             final AtomicInteger counter = new AtomicInteger(docIdsToLoad.size());