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 16808E47E for ; Fri, 8 Mar 2013 14:06:28 +0000 (UTC) Received: (qmail 97287 invoked by uid 500); 8 Mar 2013 14:06:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97149 invoked by uid 500); 8 Mar 2013 14:06:27 -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 97114 invoked by uid 99); 8 Mar 2013 14:06:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 14:06:25 +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:06:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 03DD423888E7; Fri, 8 Mar 2013 14:06:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1454391 - /cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Date: Fri, 08 Mar 2013 14:06:02 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130308140603.03DD423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Mar 8 14:06:02 2013 New Revision: 1454391 URL: http://svn.apache.org/r1454391 Log: [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/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Modified: cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?rev=1454391&r1=1454390&r2=1454391&view=diff ============================================================================== --- cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java (original) +++ cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java Fri Mar 8 14:06:02 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; + } }