You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/12/13 02:47:21 UTC
lucene-solr:branch_6x: SOLR:9823: CoreContainer incorrectly setting
MDCLoggingContext for core
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x a243f2097 -> 0ffdacfb1
SOLR:9823: CoreContainer incorrectly setting MDCLoggingContext for core
(cherry picked from commit 8c79ab2)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0ffdacfb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0ffdacfb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0ffdacfb
Branch: refs/heads/branch_6x
Commit: 0ffdacfb145d63a9ac5422c6bba398b604570ee5
Parents: a243f20
Author: Erick <er...@apache.org>
Authored: Mon Dec 12 18:43:30 2016 -0800
Committer: Erick <er...@apache.org>
Committed: Mon Dec 12 18:47:01 2016 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ffdacfb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 59708a7..9687463 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -180,6 +180,8 @@ Bug Fixes
* SOLR-9707: Don't forward DeleteByQuery requests to down replicas. (Jessica Cheng Mallet via Varun Thacker)
+* SOLR-9823: CoreContainer incorrectly setting MDCLoggingContext for core (Jessica Cheng Mallet via Erick Erickson)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0ffdacfb/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 8f0a146..c80494f 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -831,7 +831,7 @@ public class CoreContainer {
SolrCore core = null;
try {
- MDCLoggingContext.setCore(core);
+ MDCLoggingContext.setCoreDescriptor(dcore);
SolrIdentifierValidator.validateCoreName(dcore.getName());
if (zkSys.getZkController() != null) {
zkSys.getZkController().preRegister(dcore);