[infinispan-commits] Infinispan SVN: r2469 - branches/4.2.x/core/src/test/java/org/infinispan/jmx.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Sat Oct 2 13:43:58 EDT 2010
Author: pferraro
Date: 2010-10-02 13:43:57 -0400 (Sat, 02 Oct 2010)
New Revision: 2469
Modified:
branches/4.2.x/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
branches/4.2.x/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
Log:
[ISPN-677] MalformedObjectNameException during jmx registration if cache name contains unexpected characters
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/ActivationAndPassivationInterceptorMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -51,8 +51,8 @@
cacheManager.defineConfiguration("test", configuration);
cache = cacheManager.getCache("test");
- activationInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=Activation");
- passivationInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=Passivation");
+ activationInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=Activation");
+ passivationInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=Passivation");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
cacheStore = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheLoaderAndCacheStoreInterceptorMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -48,8 +48,8 @@
cacheManager.defineConfiguration("test", configuration);
cache = cacheManager.getCache("test");
- loaderInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=CacheLoader");
- storeInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=CacheStore");
+ loaderInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=CacheLoader");
+ storeInterceptorObjName = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=CacheStore");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
cacheStore = TestingUtil.extractComponent(cache, CacheLoaderManager.class).getCacheStore();
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -52,8 +52,8 @@
}
public void testStartStopManagedOperations() throws Exception {
- ObjectName defaultOn = new ObjectName(JMX_DOMAIN + ":cache-name=" + CacheContainer.DEFAULT_CACHE_NAME + "(local),jmx-resource=Cache");
- ObjectName managerON = new ObjectName(JMX_DOMAIN + ":cache-name=[global],jmx-resource=CacheManager");
+ ObjectName defaultOn = new ObjectName(JMX_DOMAIN + ":cache-name=\"" + CacheContainer.DEFAULT_CACHE_NAME + "(local)\",jmx-resource=Cache");
+ ObjectName managerON = new ObjectName(JMX_DOMAIN + ":cache-name=\"[global]\",jmx-resource=CacheManager");
server.invoke(managerON, "startCache", new Object[]{}, new String[]{});
assert ComponentStatus.RUNNING.toString().equals(server.getAttribute(defaultOn, "CacheStatus"));
assert server.getAttribute(managerON, "CreatedCacheCount").equals("1");
@@ -82,9 +82,9 @@
public void testManagerStopRemovesCacheMBean(Method m) throws Exception {
final String otherJmxDomain = JMX_DOMAIN + '.' + m.getName();
- ObjectName defaultOn = new ObjectName(otherJmxDomain + ":cache-name=" + CacheContainer.DEFAULT_CACHE_NAME + "(local),jmx-resource=Cache");
- ObjectName galderOn = new ObjectName(otherJmxDomain + ":cache-name=galder(local),jmx-resource=Cache");
- ObjectName managerON = new ObjectName(otherJmxDomain + ":cache-name=[global],jmx-resource=CacheManager");
+ ObjectName defaultOn = new ObjectName(otherJmxDomain + ":cache-name=\"" + CacheContainer.DEFAULT_CACHE_NAME + "(local)\",jmx-resource=Cache");
+ ObjectName galderOn = new ObjectName(otherJmxDomain + ":cache-name=\"galder(local)\",jmx-resource=Cache");
+ ObjectName managerON = new ObjectName(otherJmxDomain + ":cache-name=\"[global]\",jmx-resource=CacheManager");
CacheContainer otherContainer = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(otherJmxDomain);
server.invoke(managerON, "startCache", new Object[]{}, new String[]{});
server.invoke(managerON, "startCache", new Object[]{"galder"}, new String[]{String.class.getName()});
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheManagerMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -31,7 +31,7 @@
protected EmbeddedCacheManager createCacheManager() throws Exception {
cacheManager = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(JMX_DOMAIN, true, false);
- name = new ObjectName(JMX_DOMAIN + ":cache-name=[global],jmx-resource=CacheManager");
+ name = new ObjectName(JMX_DOMAIN + ":cache-name=\"[global]\",jmx-resource=CacheManager");
server = PerThreadMBeanServerLookup.getThreadMBeanServer();
server.invoke(name, "startCache", new Object[]{}, new String[]{});
return cacheManager;
@@ -80,7 +80,7 @@
public void testJmxRegistrationAtStartupAndStop(Method method) throws Exception {
final String otherJmxDomain = JMX_DOMAIN + '.' + method.getName();
CacheContainer otherContainer = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(otherJmxDomain, true, false);
- ObjectName otherName = new ObjectName(otherJmxDomain + ":cache-name=[global],jmx-resource=CacheManager");
+ ObjectName otherName = new ObjectName(otherJmxDomain + ":cache-name=\"[global]\",jmx-resource=CacheManager");
try {
assert server.getAttribute(otherName, "CreatedCacheCount").equals("0");
} finally {
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/CacheMgmtInterceptorMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -38,7 +38,7 @@
cacheManager.defineConfiguration("test", configuration);
cache = cacheManager.getCache("test");
advanced = cache.getAdvancedCache();
- mgmtInterceptor = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=Statistics");
+ mgmtInterceptor = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=Statistics");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
return cacheManager;
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/ComponentsJmxRegistrationTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -132,7 +132,7 @@
}
private void assertCorrectJmxName(ObjectName objectName, Cache cache) {
- assert objectName.getKeyProperty(ComponentsJmxRegistration.CACHE_NAME_KEY).startsWith(cache.getName());
+ assert ObjectName.unquote(objectName.getKeyProperty(ComponentsJmxRegistration.CACHE_NAME_KEY)).startsWith(cache.getName());
assert objectName.getKeyProperty(ComponentsJmxRegistration.JMX_RESOURCE_KEY) != null;
}
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -71,19 +71,19 @@
cm.getCache("remote1");
cm.getCache("remote2");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=RpcManager");
- assert existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=Statistics");
- assert existsObject(jmxDomain + ":cache-name=remote2(invalidation_async),jmx-resource=RpcManager");
- assert existsObject(jmxDomain + ":cache-name=remote2(invalidation_async),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=RpcManager");
+ assert existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"remote2(invalidation_async)\",jmx-resource=RpcManager");
+ assert existsObject(jmxDomain + ":cache-name=\"remote2(invalidation_async)\",jmx-resource=Statistics");
TestingUtil.killCacheManagers(cm);
- assert !existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert !existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=RpcManager");
- assert !existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=Statistics");
- assert !existsObject(jmxDomain + ":cache-name=remote2(invalidation_async),jmx-resource=RpcManager");
- assert !existsObject(jmxDomain + ":cache-name=remote2(invalidation_async),jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=RpcManager");
+ assert !existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"remote2(invalidation_async)\",jmx-resource=RpcManager");
+ assert !existsObject(jmxDomain + ":cache-name=\"remote2(invalidation_async)\",jmx-resource=Statistics");
}
public void testDifferentDomain() {
@@ -96,7 +96,7 @@
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
}
@@ -118,9 +118,9 @@
cm.getCache("local_cache");
cm.getCache("remote1");
- assert !existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert existsObject(jmxDomain + ":cache-name=[global],jmx-resource=CacheManager");
- assert !existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"[global]\",jmx-resource=CacheManager");
+ assert !existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=Statistics");
}
public void testOnlyPerCacheJmxStatsEnabled() {
@@ -141,9 +141,9 @@
cm.getCache("local_cache");
cm.getCache("remote1");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert !existsObject(jmxDomain + ":cache-name=[global],jmx-resource=RpcManager");
- assert existsObject(jmxDomain + ":cache-name=remote1(repl_sync),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"[global]\",jmx-resource=RpcManager");
+ assert existsObject(jmxDomain + ":cache-name=\"remote1(repl_sync)\",jmx-resource=Statistics");
}
public void testMultipleManagersOnSameServerFails(Method method) throws Exception {
@@ -156,7 +156,7 @@
localCache.setExposeJmxStatistics(true);
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
globalConfiguration2.setJmxDomain(jmxDomain);
@@ -174,7 +174,7 @@
CacheContainer duplicateAllowedContainer = TestCacheManagerFactory.createCacheManagerEnforceJmxDomain(globalConfiguration2);
try {
final String duplicateName = jmxDomain + "2";
- ObjectName duplicateObjectName = new ObjectName(duplicateName + ":cache-name=[global],jmx-resource=CacheManager");
+ ObjectName duplicateObjectName = new ObjectName(duplicateName + ":cache-name=\"[global]\",jmx-resource=CacheManager");
server.getAttribute(duplicateObjectName, "CreatedCacheCount").equals("0");
} finally {
duplicateAllowedContainer.stop();
@@ -190,7 +190,7 @@
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
String jmxDomain = globalConfiguration.getJmxDomain();
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
GlobalConfiguration globalConfigurationClone = globalConfiguration.clone();
globalConfigurationClone.setExposeGlobalJmxStatistics(true);
@@ -214,7 +214,7 @@
localCache.setExposeJmxStatistics(true);
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
globalConfiguration2.setExposeGlobalJmxStatistics(true);
@@ -226,7 +226,7 @@
localCache2.setExposeJmxStatistics(true);
cm2.defineConfiguration("local_cache", localCache);
cm2.getCache("local_cache");
- assert existsObject(jmxDomain2 + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain2 + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
GlobalConfiguration globalConfiguration3 = GlobalConfiguration.getClusteredDefault();
globalConfiguration3.setExposeGlobalJmxStatistics(true);
@@ -238,7 +238,7 @@
cm3.defineConfiguration("local_cache", localCache);
cm3.getCache("local_cache");
String jmxDomain3 = cm3.getGlobalConfiguration().getJmxDomain();
- assert existsObject(jmxDomain3 + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain3 + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
}
public void testUnregisterJmxInfoOnStop() {
@@ -251,11 +251,11 @@
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
String jmxDomain = globalConfiguration.getJmxDomain();
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
TestingUtil.killCacheManagers(cm);
- assert !existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
assert !existsDomains(jmxDomain);
}
@@ -268,8 +268,8 @@
cm.defineConfiguration("local_cache", localCache);
cm.getCache("local_cache");
String jmxDomain = cm.getGlobalConfiguration().getJmxDomain();
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Cache");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Cache");
//now register a global one
GlobalConfiguration globalConfiguration2 = GlobalConfiguration.getClusteredDefault();
@@ -283,17 +283,17 @@
cm2.defineConfiguration("remote_cache", remoteCache);
cm2.getCache("remote_cache");
String jmxDomain2 = cm2.getGlobalConfiguration().getJmxDomain();
- assert existsObject(jmxDomain2 + ":cache-name=remote_cache(repl_sync),jmx-resource=Cache");
- assert existsObject(jmxDomain2 + ":cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
+ assert existsObject(jmxDomain2 + ":cache-name=\"remote_cache(repl_sync)\",jmx-resource=Cache");
+ assert existsObject(jmxDomain2 + ":cache-name=\"remote_cache(repl_sync)\",jmx-resource=Statistics");
cm2.stop();
- assert existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert !existsObject(jmxDomain2 + ":cache-name=remote_cache(repl_sync),jmx-resource=Cache");
- assert !existsObject(jmxDomain2 + ":cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
+ assert existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert !existsObject(jmxDomain2 + ":cache-name=\"remote_cache(repl_sync)\",jmx-resource=Cache");
+ assert !existsObject(jmxDomain2 + ":cache-name=\"remote_cache(repl_sync)\",jmx-resource=Statistics");
cm.stop();
- assert !existsObject(jmxDomain + ":cache-name=local_cache(local),jmx-resource=Statistics");
- assert !existsObject(jmxDomain2 + ":cache-name=remote_cache(repl_sync),jmx-resource=Statistics");
+ assert !existsObject(jmxDomain + ":cache-name=\"local_cache(local)\",jmx-resource=Statistics");
+ assert !existsObject(jmxDomain2 + ":cache-name=\"remote_cache(repl_sync)\",jmx-resource=Statistics");
}
public void testStopUnstartedCacheManager() {
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/MvccLockManagerMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -38,7 +38,7 @@
cacheManager.defineConfiguration("test", configuration);
cache = cacheManager.getCache("test");
- lockManagerObjName = new ObjectName(JMX_DOMAIN + ":cache-name=test(local),jmx-resource=LockManager");
+ lockManagerObjName = new ObjectName(JMX_DOMAIN + ":cache-name=\"test(local)\",jmx-resource=LockManager");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
return cacheManager;
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -80,8 +80,8 @@
Cache cache1 = manager(0).getCache(cachename);
Cache cache2 = manager(1).getCache(cachename);
MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
- ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
- ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
assert mBeanServer.isRegistered(rpcManager1);
assert mBeanServer.isRegistered(rpcManager2);
@@ -119,8 +119,8 @@
Cache cache1 = manager(0).getCache(cachename);
Cache cache2 = manager(1).getCache(cachename);
MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
- ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
- ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) 0);
assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals((long) 0);
@@ -205,8 +205,8 @@
@Test(dependsOnMethods = "testSuccessRatio")
public void testAddressInformation() throws Exception {
MBeanServer mBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
- ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
- ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
+ ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
+ ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=\"" + cachename + "(repl_sync)\",jmx-resource=RpcManager");
String cm1Address = manager(0).getAddress().toString();
String cm2Address = manager(1).getAddress().toString();
assert mBeanServer.getAttribute(rpcManager1, "NodeAddress").equals(cm1Address);
Modified: branches/4.2.x/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java
===================================================================
--- branches/4.2.x/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java 2010-10-02 17:40:50 UTC (rev 2468)
+++ branches/4.2.x/core/src/test/java/org/infinispan/jmx/TxInterceptorMBeanTest.java 2010-10-02 17:43:57 UTC (rev 2469)
@@ -40,7 +40,7 @@
cacheManager2.defineConfiguration("test", configuration.clone());
cache1 = cacheManager1.getCache("test");
cache2 = cacheManager2.getCache("test");
- txInterceptor = new ObjectName("TxInterceptorMBeanTest:cache-name=test(repl_sync),jmx-resource=Transactions");
+ txInterceptor = new ObjectName("TxInterceptorMBeanTest:cache-name=\"test(repl_sync)\",jmx-resource=Transactions");
threadMBeanServer = PerThreadMBeanServerLookup.getThreadMBeanServer();
tm = TestingUtil.getTransactionManager(cache1);
More information about the infinispan-commits
mailing list