From f20c6ec9cf6004ae281fe95fdf2d7294043ed8dd Mon Sep 17 00:00:00 2001 From: kimchy Date: Thu, 24 Mar 2011 00:40:21 +0200 Subject: [PATCH] check if index service is null, and don't load percolators in this case --- .../elasticsearch/index/percolator/PercolatorService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java index 929bdf525dc..644368bdabf 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/percolator/PercolatorService.java @@ -213,7 +213,11 @@ public class PercolatorService extends AbstractIndexComponent { } // we are only interested when the first shard on this node has been created for an index // when it does, fetch the relevant queries if not fetched already - if (indicesService.indexService(indexShard.shardId().index().name()).numberOfShards() != 1) { + IndexService indexService = indicesService.indexService(indexShard.shardId().index().name()); + if (indexService == null) { + return; + } + if (indexService.numberOfShards() != 1) { return; } synchronized (mutex) {