You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/03/06 11:07:56 UTC
svn commit: r1078442 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/test/java/org/apache/camel/management/
components/camel-spring/src/test/java/org/apache/camel/spring/processor/
Author: davsclaus
Date: Sun Mar 6 10:07:55 2011
New Revision: 1078442
URL: http://svn.apache.org/viewvc?rev=1078442&view=rev
Log:
CAMEL-3760: Fixed thrad pools naming not being quoted when registered in JMX.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java Sun Mar 6 10:07:55 2011
@@ -254,11 +254,13 @@ public class DefaultManagementNamingStra
buffer.append(domainName).append(":");
buffer.append(KEY_CONTEXT + "=").append(getContextId(context)).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_THREAD_POOL + ",");
- buffer.append(KEY_NAME + "=").append(id);
+
+ String name = id;
if (sourceId != null) {
// provide source id if we know it, this helps end user to know where the pool is used
- buffer.append("(").append(sourceId).append(")");
+ name = name + "(" + sourceId + ")";
}
+ buffer.append(KEY_NAME + "=").append(ObjectName.quote(name));
return createObjectName(buffer);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java Sun Mar 6 10:07:55 2011
@@ -32,7 +32,7 @@ public class DualManagedThreadPoolProfil
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=threads1(threads)");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"threads1(threads)\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(5, corePoolSize.intValue());
@@ -52,7 +52,7 @@ public class DualManagedThreadPoolProfil
String profile = (String) mbeanServer.getAttribute(on, "ThreadPoolProfileId");
assertEquals("custom", profile);
- on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=threads2(threads)");
+ on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"threads2(threads)\"");
corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(5, corePoolSize.intValue());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java Sun Mar 6 10:07:55 2011
@@ -29,7 +29,7 @@ public class DualManagedThreadPoolWithId
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myThreads(threads)");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myThreads(threads)\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(15, corePoolSize.intValue());
@@ -46,7 +46,7 @@ public class DualManagedThreadPoolWithId
String route = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", route);
- on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myOtherThreads(threads)");
+ on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myOtherThreads(threads)\"");
corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(1, corePoolSize.intValue());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java Sun Mar 6 10:07:55 2011
@@ -32,7 +32,7 @@ public class ManagedThreadPoolProfileTes
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=threads1(threads)");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"threads1(threads)\"");
Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown");
assertEquals(false, shutdown.booleanValue());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java Sun Mar 6 10:07:55 2011
@@ -29,7 +29,7 @@ public class ManagedThreadPoolTest exten
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=threads1(threads)");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"threads1(threads)\"");
Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown");
assertEquals(false, shutdown.booleanValue());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java Sun Mar 6 10:07:55 2011
@@ -29,7 +29,7 @@ public class ManagedThreadPoolWithIdTest
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myThreads(threads)");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myThreads(threads)\"");
Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown");
assertEquals(false, shutdown.booleanValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/DualSpringManagedThreadsThreadPoolTest.java Sun Mar 6 10:07:55 2011
@@ -33,7 +33,7 @@ public class DualSpringManagedThreadsThr
public void testDualManagedThreadPool() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myPool");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myPool\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(2, corePoolSize.intValue());
@@ -57,7 +57,7 @@ public class DualSpringManagedThreadsThr
String routeId = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals(null, routeId);
- on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myOtherPool");
+ on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myOtherPool\"");
corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(7, corePoolSize.intValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java?rev=1078442&r1=1078441&r2=1078442&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringManagedThreadsThreadPoolTest.java Sun Mar 6 10:07:55 2011
@@ -33,7 +33,7 @@ public class SpringManagedThreadsThreadP
public void testManagedThreadPool() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myPool");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=\"myPool\"");
Integer corePoolSize = (Integer) mbeanServer.getAttribute(on, "CorePoolSize");
assertEquals(2, corePoolSize.intValue());