Author: sergeyb
Date: Mon Nov 25 10:15:25 2013
New Revision: 1545207
URL: http://svn.apache.org/r1545207
Log:
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.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1544637
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=1545207&r1=1545206&r2=1545207&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
Mon Nov 25 10:15:25 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;
}