You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2018/10/08 01:26:51 UTC
[cxf] 04/04: [CXF-7827]a bit revise
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2582777223d7373c2201606a537db6b7980c7c5e
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Aug 31 11:00:17 2018 +0800
[CXF-7827]a bit revise
(cherry picked from commit ce2fcd19c63b7f666b778d482c5aa40e0e0c1828)
---
core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java | 2 +-
.../java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index b6ade80..d24a9ea 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -87,7 +87,7 @@ public class ServerImpl implements Server {
if (wantFilter != null && wantFilter.startsWith("jms")) {
RegexLoggingFilter filter = new RegexLoggingFilter();
- filter.setPattern("jms(.*?)password=+([^ ]+)[.]");
+ filter.setPattern("jms(.*?)password=+([^ ]+)");
filter.setGroup(2);
wantFilter = filter.filter(wantFilter).toString();
}
diff --git a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
index 7b77941..f883e13 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/RegexLoggingFilterTest.java
@@ -27,10 +27,10 @@ public class RegexLoggingFilterTest extends Assert {
public void testFilter() throws Exception {
String wantFilter = "jms:queue:soapRequestQueue?username=admin&password=admin123.";
RegexLoggingFilter filter = new RegexLoggingFilter();
- filter.setPattern("jms(.*?)password=+([^ ]+)[.]");
+ filter.setPattern("jms(.*?)password=+([^ ]+)");
filter.setGroup(2);
wantFilter = filter.filter(wantFilter).toString();
- assertEquals(wantFilter, "jms:queue:soapRequestQueue?username=admin&password=*****.");
+ assertEquals(wantFilter, "jms:queue:soapRequestQueue?username=admin&password=*****");
}
}