honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix npe

Browse Source
This commit is contained in:
Martijn van Groningen 2015-07-10 17:12:51 +02:00
parent 9eb11267f5
commit 512239041b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
View File

@ -182,7 +182,7 @@ public class IndexNameExpressionResolver {
*/ */
public String[] filteringAliases(ClusterState state, String index, String... expressions) { public String[] filteringAliases(ClusterState state, String index, String... expressions) {
// expand the aliases wildcard // expand the aliases wildcard
List<String> resolvedExpressions = Arrays.asList(expressions); List<String> resolvedExpressions = expressions != null ? Arrays.asList(expressions) : Collections.<String>emptyList();
Context context = new Context(state, IndicesOptions.lenientExpandOpen()); Context context = new Context(state, IndicesOptions.lenientExpandOpen());
for (ExpressionResolver expressionResolver : expressionResolvers) { for (ExpressionResolver expressionResolver : expressionResolvers) {
resolvedExpressions = expressionResolver.resolve(context, resolvedExpressions); resolvedExpressions = expressionResolver.resolve(context, resolvedExpressions);

7
core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
View File

@ -1700,12 +1700,11 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
ensureGreen("idx"); ensureGreen("idx");
try { try {
client().prepareIndex("idx", PercolatorService.TYPE_NAME, "1") client().prepareIndex("idx", PercolatorService.TYPE_NAME, "1")
.setSource(jsonBuilder().startObject().field("query", QueryBuilders.queryStringQuery("color:red")).endObject()) .setSource(jsonBuilder().startObject().field("query", QueryBuilders.queryStringQuery("color:red")).endObject())
.get(); .get();
fail(); fail();
} catch (PercolatorException e) { } catch (PercolatorException e) {
} }
PercolateResponse percolateResponse = client().preparePercolate().setDocumentType("type") PercolateResponse percolateResponse = client().preparePercolate().setDocumentType("type")