[cxf] branch 3.5.x-fixes updated: [CXF-8699] Force configuration of sensitive informations when configuration changes. Handles case when properties are commented out (#949)

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
     new 2463f980a5 [CXF-8699] Force configuration of sensitive informations 
when configuration changes. Handles case when properties are commented out 
(#949)
2463f980a5 is described below

commit 2463f980a52e9d1cb716a281082e2d3d2c466473
Author: Julien Greffe <36693362+jgre...@users.noreply.github.com>
AuthorDate: Fri May 13 13:12:42 2022 +0200

    [CXF-8699] Force configuration of sensitive informations when configuration 
changes. Handles case when properties are commented out (#949)
    
    (cherry picked from commit a711ec62f56ed5888e2756860e7633f60bbe23c9)
---
 .../src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
index b18db196ab..4534dd7b10 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
@@ -98,13 +98,8 @@ public class Activator implements BundleActivator {
                 logging.setLogBinary(logBinary);
             }
             
-            if (!sensitiveElementNames.isEmpty()) {
-                logging.setSensitiveElementNames(sensitiveElementNames);
-            }
-            
-            if (!sensitiveProtocolHeaderNames.isEmpty()) {
-                
logging.setSensitiveProtocolHeaderNames(sensitiveProtocolHeaderNames);
-            }
+            logging.setSensitiveElementNames(sensitiveElementNames);
+            
logging.setSensitiveProtocolHeaderNames(sensitiveProtocolHeaderNames);
 
             if (intentReg == null) {
                 Dictionary<String, Object> properties = new Hashtable<>();