From 3adb0903bf629f07cfc4f42fafab24c0fb9718b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Sat, 23 Nov 2019 01:21:47 +0100 Subject: [PATCH] SOLR-13465 CoreContainer.auditloggerPlugin should be volatile (#672) (cherry picked from commit 312431b1821a67c9ddb7e219b9203d6fd7bdd5df) --- solr/CHANGES.txt | 2 ++ solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index ed12ed6f4cb..53957b7d66b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -116,6 +116,8 @@ Bug Fixes * SOLR-13950: Fix InterruptedException being swallowed in ZkStateReader’s getLeaderRetry method (Andy Vuong via Tomás Fernández Löbbe) +* SOLR-13465: CoreContainer.auditloggerPlugin should be volatile (janhoy, hossman) + Other Changes --------------------- 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 3ff86d2f609..af2627dd6d9 100644 --- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java +++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java @@ -206,7 +206,7 @@ public class CoreContainer { private volatile SecurityPluginHolder authenticationPlugin; - private SecurityPluginHolder auditloggerPlugin; + private volatile SecurityPluginHolder auditloggerPlugin; private volatile BackupRepositoryFactory backupRepoFactory;