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:14:33 UTC
[cxf] branch 3.4.x-fixes updated (4665cd7198 -> d84396ff87)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 4665cd7198 Recording .gitmergeinfo Changes
new 0d586e44d8 [CXF-8699] Force configuration of sensitive informations when configuration changes. Handles case when properties are commented out (#949)
new d84396ff87 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
.../src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java | 9 ++-------
2 files changed, 3 insertions(+), 7 deletions(-)
[cxf] 01/02: [CXF-8699] Force configuration of sensitive informations when configuration changes. Handles case when properties are commented out (#949)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0d586e44d858a950e2dc92c141500f6acdf57c9c
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)
(cherry picked from commit a711ec62f56ed5888e2756860e7633f60bbe23c9)
(cherry picked from commit 2463f980a52e9d1cb716a281082e2d3d2c466473)
---
.../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<>();
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d84396ff87775316b12adefc0a2319b82866cf17
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 13 12:14:19 2022 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3b7a0daf07..cb0d6bb663 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -62,6 +62,7 @@ B 63dcd46765370f242d2c1a2db1689c6c0128a24d
B 6588a958996031e2f213f11f44ea166687d26af5
B 65e9e1a6e41881a8678f196866cabf431c809058
B 672b3ea80bfcb3570b38f343eb5b484c4e11a895
+B 680bd3cb3477202730bfdd7f98157b02e53f7936
B 68d8f69052a37b3639043e0b7ea9dc301ca1cac2
B 69bde238c2118718272bf6fc672e565d16d7a6d4
B 6a9d5ec79d7b0532025485b53907a87e9d6e996f