From 3d9e8b745fb867d4926e474f017ada2fa5841f3f Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Mon, 30 Jul 2012 00:42:46 +0000 Subject: [PATCH] fix the monkey: connection loss and expiration cause NPE git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1366969 13f79535-47bb-0310-9956-ffa450edef68 --- solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java index ef424a9ae67..eb68fdb0fcf 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java @@ -99,9 +99,9 @@ public class ChaosMonkey { public void expireRandomSession() throws KeeperException, InterruptedException { String sliceName = getRandomSlice(); - JettySolrRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders).jetty; + CloudJettyRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders); if (jetty != null) { - expireSession(jetty); + expireSession(jetty.jetty); expires.incrementAndGet(); } } @@ -110,9 +110,9 @@ public class ChaosMonkey { monkeyLog("cause connection loss!"); String sliceName = getRandomSlice(); - JettySolrRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders).jetty; + CloudJettyRunner jetty = getRandomJetty(sliceName, aggressivelyKillLeaders); if (jetty != null) { - causeConnectionLoss(jetty); + causeConnectionLoss(jetty.jetty); connloss.incrementAndGet(); } }