opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Make VelocityRuntimeProvider singleton, not RuntimeInstance
  Throw QueryParseException if the created phrase query is null

Change-Id: I2ca604abd6bc0c14b95ea67fee4e63f8088621ca
This commit is contained in:
David Pursehouse
2016-08-01 09:25:03 +09:00
parent d40d3def31 8cf2a56bda
commit 6c64d0df14
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java
View File

@@ -241,7 +241,12 @@ public class QueryBuilder<V> {
throw new QueryParseException(
"Full-text search over empty string not supported");
}
return queryBuilder.createPhraseQuery(p.getField().getName(), value);
Query query = queryBuilder.createPhraseQuery(p.getField().getName(), value);
if (query == null) {
throw new QueryParseException(
"Cannot create full-text query with value: " + value);
}
return query;
}
public int toIndexTimeInMinutes(Date ts) {