From 512239041bc94bebc6679911904b95dd1437015b Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 10 Jul 2015 17:12:51 +0200 Subject: [PATCH] fix npe --- .../cluster/metadata/IndexNameExpressionResolver.java | 2 +- .../java/org/elasticsearch/percolator/PercolatorTests.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java index 10b38e8ca08..50e6f8e63f9 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java @@ -182,7 +182,7 @@ public class IndexNameExpressionResolver { */ public String[] filteringAliases(ClusterState state, String index, String... expressions) { // expand the aliases wildcard - List resolvedExpressions = Arrays.asList(expressions); + List resolvedExpressions = expressions != null ? Arrays.asList(expressions) : Collections.emptyList(); Context context = new Context(state, IndicesOptions.lenientExpandOpen()); for (ExpressionResolver expressionResolver : expressionResolvers) { resolvedExpressions = expressionResolver.resolve(context, resolvedExpressions); diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java index e4de48cf582..c21634d2e0e 100644 --- a/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java +++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorTests.java @@ -1700,12 +1700,11 @@ public class PercolatorTests extends ElasticsearchIntegrationTest { ensureGreen("idx"); try { - client().prepareIndex("idx", PercolatorService.TYPE_NAME, "1") - .setSource(jsonBuilder().startObject().field("query", QueryBuilders.queryStringQuery("color:red")).endObject()) - .get(); + client().prepareIndex("idx", PercolatorService.TYPE_NAME, "1") + .setSource(jsonBuilder().startObject().field("query", QueryBuilders.queryStringQuery("color:red")).endObject()) + .get(); fail(); } catch (PercolatorException e) { - } PercolateResponse percolateResponse = client().preparePercolate().setDocumentType("type")