Keep oldConfig

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 3, 2024 · d24ca83 · d24ca83
1 parent e133b39
commit d24ca83
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java b/src/main/java/org/opensearch/security/configuration/DlsFlsValveImpl.java
@@ -680,7 +680,7 @@ static Mode get(Settings settings) {
     public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfiguration) {
         try {
             if (rolesConfiguration != null) {
-                this.dlsFlsProcessedConfig.set(
+                DlsFlsProcessedConfig oldConfig = this.dlsFlsProcessedConfig.getAndSet(
                     new DlsFlsProcessedConfig(
                         DynamicConfigFactory.addStatics(rolesConfiguration.clone()),
                         clusterService.state().metadata().getIndicesLookup(),
@@ -689,6 +689,10 @@ public void updateConfiguration(SecurityDynamicConfiguration<RoleV7> rolesConfig
                         fieldMaskingConfig
                     )
                 );
+
+                if (oldConfig != null) {
+                    oldConfig.shutdown();
+                }
             }
         } catch (Exception e) {
             log.error("Error while updating DLS/FLS configuration with {}", rolesConfiguration, e);