Author: dkulp Date: Wed Nov 27 17:44:04 2013 New Revision: 1546138 URL: http://svn.apache.org/r1546138 Log: Merged revisions 1545207 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1545207 | sergeyb | 2013-11-25 05:15:25 -0500 (Mon, 25 Nov 2013) | 9 lines Merged revisions 1544637 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1544637 | sergeyb | 2013-11-22 18:52:43 +0000 (Fri, 22 Nov 2013) | 1 line [CXF-5415] Escaping service and operation names when needed ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Modified: cxf/branches/2.6.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=1546138&r1=1546137&r2=1546138&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original) +++ cxf/branches/2.6.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Wed Nov 27 17:44:04 2013 @@ -107,7 +107,7 @@ public abstract class AbstractMessageRes Service service = ex.get(Service.class); Endpoint endpoint = ex.get(Endpoint.class); - String serviceName = "\"" + service.getName() + "\""; + String serviceName = "\"" + escapePatternChars(service.getName().toString()) + "\""; String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\""; OperationInfo opInfo = ex.get(OperationInfo.class); @@ -152,7 +152,7 @@ public abstract class AbstractMessageRes protected String escapePatternChars(String value) { // This can be replaced if really needed with pattern-based matching if (value.lastIndexOf(QUESTION_MARK) != -1) { - value.replace(QUESTION_MARK, ESCAPED_QUESTION_MARK); + value = value.replace(QUESTION_MARK, ESCAPED_QUESTION_MARK); } return value; }
