SOLR-6095 Uncaught Exception causing test failures

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1603467 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2014-06-18 14:46:38 +00:00
parent 88031f7524
commit 76f4abe306
1 changed files with 6 additions and 2 deletions

View File

@ -326,8 +326,12 @@ public class Overseer {
} }
} finally { } finally {
//if I am not shutting down, Then I need to rejoin election //if I am not shutting down, Then I need to rejoin election
if (zkController != null && !zkController.getCoreContainer().isShutDown()) { try {
zkController.rejoinOverseerElection(null, false); if (zkController != null && !zkController.getCoreContainer().isShutDown()) {
zkController.rejoinOverseerElection(null, false);
}
} catch (Exception e) {
log.warn("Unable to rejoinElection ",e);
} }
} }
} }