Apache Solr open-source search software
SOLR-16343: Handle MDC snapshot being null
Dee Mooreae242ff03372
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 00ab4bff27e..19f2cab9672 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -139,6 +139,8 @@ Bug Fixes* SOLR-16357: CaffeineCache ramBytes incorrect accounting on updates and deletes (Alex Deparvu)+* SOLR-16343: Handle MDC snapshot being null (Dee Moore via Kevin Risden)+Other Changes---------------------* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)diff --git a/solr/core/src/java/org/apache/solr/logging/MDCSnapshot.java b/solr/core/src/java/org/apache/solr/logging/MDCSnapshot.javaindex c5a5f81ec44..83b55d8bb04 100644--- a/solr/core/src/java/org/apache/solr/logging/MDCSnapshot.java+++ b/solr/core/src/java/org/apache/solr/logging/MDCSnapshot.java@@ -45,12 +45,11 @@ public final class MDCSnapshot implements Closeable {private MDCSnapshot() {this.snapshot = MDC.getCopyOfContextMap();- assert null != snapshot;}public void close() {MDC.clear();- if (!snapshot.isEmpty()) { // common case optimization+ if (snapshot != null && !snapshot.isEmpty()) { // common case optimizationMDC.setContextMap(snapshot);}}