Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 09D80E4C1 for ; Fri, 8 Mar 2013 14:16:54 +0000 (UTC) Received: (qmail 45286 invoked by uid 500); 8 Mar 2013 14:16:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45173 invoked by uid 500); 8 Mar 2013 14:16:53 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 45161 invoked by uid 99); 8 Mar 2013 14:16:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 14:16:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 14:16:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DCE9723888E7; Fri, 8 Mar 2013 14:16:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1454398 - in /cxf/branches/2.5.x-fixes: ./ rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Date: Fri, 08 Mar 2013 14:16:32 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130308141632.DCE9723888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Mar 8 14:16:32 2013 New Revision: 1454398 URL: http://svn.apache.org/r1454398 Log: Merged revisions 1454397 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1454397 | sergeyb | 2013-03-08 14:13:53 +0000 (Fri, 08 Mar 2013) | 16 lines Merged revisions 1454393 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1454393 | sergeyb | 2013-03-08 14:09:49 +0000 (Fri, 08 Mar 2013) | 9 lines Merged revisions 1454391 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1454391 | sergeyb | 2013-03-08 14:06:02 +0000 (Fri, 08 Mar 2013) | 1 line [CXF-4873] Escape the MBean ObjectName question mark pattern char in the counter interceptor operation name value if it comes as a message property ........ ................ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1454393 Merged /cxf/trunk:r1454391 Merged /cxf/branches/2.6.x-fixes:r1454397 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=1454398&r1=1454397&r2=1454398&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Fri Mar 8 14:16:32 2013 @@ -41,6 +41,8 @@ import org.apache.cxf.service.model.Oper public abstract class AbstractMessageResponseTimeInterceptor extends AbstractPhaseInterceptor { private static final Logger LOG = LogUtils.getL7dLogger(AbstractMessageResponseTimeInterceptor.class); + private static final String QUESTION_MARK = "?"; + private static final String ESCAPED_QUESTION_MARK = "\\?"; AbstractMessageResponseTimeInterceptor(String phase) { super(phase); @@ -114,7 +116,7 @@ public abstract class AbstractMessageRes if (operationName == null) { Object nameProperty = ex.get("org.apache.cxf.resource.operation.name"); if (nameProperty != null) { - operationName = "\"" + nameProperty.toString() + "\""; + operationName = "\"" + escapePatternChars(nameProperty.toString()) + "\""; } } @@ -147,4 +149,11 @@ 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); + } + return value; + } }