You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2022/05/13 11:12:47 UTC

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

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

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


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

commit a711ec62f56ed5888e2756860e7633f60bbe23c9
Author: Julien Greffe <36...@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)
---
 .../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 6084bd7978..f553155ed7 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
@@ -100,13 +100,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<>();