From 89444f10eb5f5a034696abde83180c057f6b97bd Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Mon, 30 Nov 2015 18:59:22 +0000
Subject: [PATCH] LUCENE-6911: Add correct StandardQueryParser.getMultiFields()
 method, deprecate no-op StandardQueryParser.getMultiFields(CharSequence[])
 method.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1717303 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                                   |  4 ++++
 .../flexible/standard/StandardQueryParser.java       | 12 ++++++++++++
 .../standard/config/StandardQueryConfigHandler.java  |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4609a81d9fa..86ed759e215 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -184,6 +184,10 @@ API Changes
   in-memory segments to disk without opening a near-real-time reader
   nor calling fsync (Robert Muir, Simon Willnauer, Mike McCandless)
 
+* LUCENE-6911: Add correct StandardQueryParser.getMultiFields() method,
+  deprecate no-op StandardQueryParser.getMultiFields(CharSequence[]) method.
+  (Christine Poerschke, Coverity Scan (via Rishabh Patel))
+
 Optimizations
 
 * LUCENE-6708: TopFieldCollector does not compute the score several times on the
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java
index b112987ac71..76b58fe621b 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java
@@ -298,11 +298,23 @@ public class StandardQueryParser extends QueryParserHelper implements CommonQuer
    * certain query is <code>null</code>
    * 
    * @param fields the fields used to expand the query
+   * @deprecated Use StandardQueryParser#getMultiFields() instead.
    */
+  @Deprecated
   public void getMultiFields(CharSequence[] fields) {
     getQueryConfigHandler().get(ConfigurationKeys.MULTI_FIELDS);
   }
 
+  /**
+   * Returns the fields used to expand the query when the field for a
+   * certain query is <code>null</code>
+   *
+   * @return the fields used to expand the query
+   */
+  public CharSequence[] getMultiFields() {
+    return getQueryConfigHandler().get(ConfigurationKeys.MULTI_FIELDS);
+  }
+
   /**
    * Set the prefix length for fuzzy queries. Default is 0.
    * 
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java
index 3b53b549df4..7570ecf1e51 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java
@@ -120,7 +120,7 @@ public class StandardQueryConfigHandler extends QueryConfigHandler {
      * is <code>null</code>
      * 
      * @see StandardQueryParser#setMultiFields(CharSequence[])
-     * @see StandardQueryParser#getMultiFields(CharSequence[])
+     * @see StandardQueryParser#getMultiFields()
      */
     final public static ConfigurationKey<CharSequence[]> MULTI_FIELDS = ConfigurationKey.newInstance();