Author: chetanm
Date: Mon Nov 30 05:15:37 2015
New Revision: 1717176
URL: http://svn.apache.org/viewvc?rev=1717176&view=rev
Log:
OAK-3654 - Integrate with Metrics for various stats collection
Quote object name if required
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java?rev=1717176&r1=1717175&r2=1717176&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
Mon Nov 30 05:15:37 2015
@@ -237,7 +237,7 @@ public class MetricStatisticsProvider im
public ObjectName createName(String type, String domain, String name) {
Hashtable<String, String> table = new Hashtable<String, String>();
table.put("type", JMX_TYPE_METRICS);
- table.put("name", name);
+ table.put("name", quoteIfRequired(name));
try {
return new ObjectName(domain, table);
} catch (MalformedObjectNameException e) {
@@ -260,4 +260,12 @@ public class MetricStatisticsProvider im
}
}
+ static String quoteIfRequired(String text) {
+ String quoted = ObjectName.quote(text);
+ if (quoted.substring(1, quoted.length() - 1).equals(text)) {
+ return text;
+ }
+ return quoted;
+ }
+
}