From 7d757a2c2ed616527297f396d1a6ff385481afc9 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Wed, 25 Jan 2012 13:03:18 +0200
Subject: [PATCH] current search context is only needed in case of script

---
 .../index/query/CustomFiltersScoreQueryParser.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java b/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java
index 2d0d0249a35..a2bf912d31f 100644
--- a/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/CustomFiltersScoreQueryParser.java
@@ -141,15 +141,15 @@ public class CustomFiltersScoreQueryParser implements QueryParser {
             throw new QueryParsingException(parseContext.index(), "[custom_filters_score] requires 'filters' field");
         }
 
-        SearchContext context = SearchContext.current();
-        if (context == null) {
-            throw new ElasticSearchIllegalStateException("No search context on going...");
-        }
         FiltersFunctionScoreQuery.FilterFunction[] filterFunctions = new FiltersFunctionScoreQuery.FilterFunction[filters.size()];
         for (int i = 0; i < filterFunctions.length; i++) {
             ScoreFunction scoreFunction;
             String script = scripts.get(i);
             if (script != null) {
+                SearchContext context = SearchContext.current();
+                if (context == null) {
+                    throw new ElasticSearchIllegalStateException("No search context on going...");
+                }
                 SearchScript searchScript = context.scriptService().search(context.lookup(), scriptLang, script, vars);
                 scoreFunction = new CustomScoreQueryParser.ScriptScoreFunction(script, vars, searchScript);
             } else {