diff --git a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java index ad76d734361..04267802160 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java +++ b/solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.java @@ -53,11 +53,16 @@ public class InstrumentedHttpRequestExecutor extends HttpRequestExecutor impleme @Override public HttpResponse execute(HttpRequest request, HttpClientConnection conn, HttpContext context) throws IOException, HttpException { - final Timer.Context timerContext = timer(request).time(); + Timer.Context timerContext = null; + if (metricsRegistry != null) { + timerContext = timer(request).time(); + } try { return super.execute(request, conn, context); } finally { - timerContext.stop(); + if (timerContext != null) { + timerContext.stop(); + } } }