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 2015/07/28 15:26:06 UTC
[1/3] camel git commit: CAMEL-9014: Lets keep track of usage of all
incoming and outgoing endpoints by default.
Repository: camel
Updated Branches:
refs/heads/master 0046232ae -> 61887fa20
CAMEL-9014: Lets keep track of usage of all incoming and outgoing endpoints by default.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/92b017cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/92b017cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/92b017cd
Branch: refs/heads/master
Commit: 92b017cd04bad06fde6a4ed0755f0e26e3d877aa
Parents: 0046232
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 28 10:53:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 10:53:29 2015 +0200
----------------------------------------------------------------------
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 10 ++++++++--
.../camel/management/DefaultManagementAgent.java | 13 +++++++++++++
.../camel/management/JmxSystemPropertyKeys.java | 3 +++
.../java/org/apache/camel/spi/ManagementAgent.java | 16 ++++++++++++++++
.../core/xml/AbstractCamelContextFactoryBean.java | 5 ++++-
.../camel/core/xml/CamelJMXAgentDefinition.java | 17 +++++++++++++++++
6 files changed, 61 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
index 17aef16..7b01c89 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
@@ -51,7 +51,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
private Map<String, Map<String, String>> outputs;
private int limit = 1000;
private boolean enabled = true;
- private boolean extended;
+ private volatile boolean extended;
private EndpointUtilizationStatistics inputUtilization;
private EndpointUtilizationStatistics outputUtilization;
@@ -190,12 +190,18 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
outputs = new HashMap<String, Map<String, String>>();
}
if (getCamelContext().getManagementStrategy().getManagementAgent() != null) {
- extended = getCamelContext().getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended();
+ Boolean isEnabled = getCamelContext().getManagementStrategy().getManagementAgent().getEndpointRuntimeStatisticsEnabled();
+ boolean isExtended = getCamelContext().getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended();
+ // extended mode is either if we use Extended statistics level or the option is explicit enabled
+ extended = isExtended || isEnabled != null && isEnabled;
}
if (extended) {
inputUtilization = new DefaultEndpointUtilizationStatistics(limit);
outputUtilization = new DefaultEndpointUtilizationStatistics(limit);
}
+ if (extended) {
+ log.info("Runtime endpoint registry is in extended mode gathering usage statistics of all incoming and outgoing endpoints (cache limit: {})", limit);
+ }
ServiceHelper.startServices(inputUtilization, outputUtilization);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index f6c76a6..a65fffc 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -79,6 +79,7 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
private Boolean createConnector = false;
private Boolean onlyRegisterProcessorWithCustomId = false;
private Boolean loadStatisticsEnabled = false;
+ private Boolean endpointRuntimeStatisticsEnabled = true;
private Boolean registerAlways = false;
private Boolean registerNewRoutes = true;
private Boolean mask = true;
@@ -153,6 +154,10 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
loadStatisticsEnabled = Boolean.getBoolean(JmxSystemPropertyKeys.LOAD_STATISTICS_ENABLED);
values.put(JmxSystemPropertyKeys.LOAD_STATISTICS_ENABLED, loadStatisticsEnabled);
}
+ if (System.getProperty(JmxSystemPropertyKeys.ENDPOINT_RUNTIME_STATISTICS_ENABLED) != null) {
+ endpointRuntimeStatisticsEnabled = Boolean.getBoolean(JmxSystemPropertyKeys.ENDPOINT_RUNTIME_STATISTICS_ENABLED);
+ values.put(JmxSystemPropertyKeys.ENDPOINT_RUNTIME_STATISTICS_ENABLED, endpointRuntimeStatisticsEnabled);
+ }
if (System.getProperty(JmxSystemPropertyKeys.STATISTICS_LEVEL) != null) {
statisticsLevel = camelContext.getTypeConverter().mandatoryConvertTo(ManagementStatisticsLevel.class, System.getProperty(JmxSystemPropertyKeys.STATISTICS_LEVEL));
values.put(JmxSystemPropertyKeys.STATISTICS_LEVEL, statisticsLevel);
@@ -287,6 +292,14 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
this.loadStatisticsEnabled = loadStatisticsEnabled;
}
+ public Boolean getEndpointRuntimeStatisticsEnabled() {
+ return endpointRuntimeStatisticsEnabled;
+ }
+
+ public void setEndpointRuntimeStatisticsEnabled(Boolean endpointRuntimeStatisticsEnabled) {
+ this.endpointRuntimeStatisticsEnabled = endpointRuntimeStatisticsEnabled;
+ }
+
public ManagementStatisticsLevel getStatisticsLevel() {
return statisticsLevel;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
index fdde84c..5684e5d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
+++ b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
@@ -53,6 +53,9 @@ public final class JmxSystemPropertyKeys {
// whether to enable gathering load statistics in the background
public static final String LOAD_STATISTICS_ENABLED = "org.apache.camel.jmx.loadStatisticsEnabled";
+ // whether to enable gathering endpoint runtime statistics
+ public static final String ENDPOINT_RUNTIME_STATISTICS_ENABLED = "org.apache.camel.jmx.endpointRuntimeStatisticsEnabled";
+
// the level of statistics enabled
public static final String STATISTICS_LEVEL = "org.apache.camel.jmx.statisticsLevel";
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java b/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
index ae552da..ac25bd2 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
@@ -319,6 +319,22 @@ public interface ManagementAgent extends Service {
Boolean getLoadStatisticsEnabled();
/**
+ * Sets whether endpoint runtime statistics is enabled (gathers runtime usage of each incoming and outgoing endpoints).
+ * <p/>
+ * The default value is <tt>true</tt>
+ *
+ * @param flag <tt>false</tt> to disable endpoint runtime statistics
+ */
+ void setEndpointRuntimeStatisticsEnabled(Boolean flag);
+
+ /**
+ * Gets whether load statistics is enabled
+ *
+ * @return <tt>true</tt> if enabled
+ */
+ Boolean getEndpointRuntimeStatisticsEnabled();
+
+ /**
* Sets the statistics level
* <p/>
* Default is {@link org.apache.camel.ManagementStatisticsLevel#Default}
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index e48b74c..20e93a3 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -460,7 +460,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
agent.setMask(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getMask()));
}
if (camelJMXAgent.getLoadStatisticsEnabled() != null) {
- agent.setMask(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getLoadStatisticsEnabled()));
+ agent.setLoadStatisticsEnabled(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getLoadStatisticsEnabled()));
+ }
+ if (camelJMXAgent.getEndpointRuntimeStatisticsEnabled() != null) {
+ agent.setEndpointRuntimeStatisticsEnabled(CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getEndpointRuntimeStatisticsEnabled()));
}
if (camelJMXAgent.getStatisticsLevel() != null) {
String level = CamelContextHelper.parseText(getContext(), camelJMXAgent.getStatisticsLevel());
http://git-wip-us.apache.org/repos/asf/camel/blob/92b017cd/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
index 1a70fc9..b4ce31b 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
@@ -112,6 +112,12 @@ public class CamelJMXAgentDefinition extends IdentifiedType {
private String loadStatisticsEnabled;
/**
+ * A flag that indicates whether endpoint runtime statistics is enabled
+ */
+ @XmlAttribute
+ private String endpointRuntimeStatisticsEnabled;
+
+ /**
* A flag that indicates whether to include hostname in JMX MBean names.
*/
@XmlAttribute
@@ -227,6 +233,14 @@ public class CamelJMXAgentDefinition extends IdentifiedType {
this.loadStatisticsEnabled = loadStatisticsEnabled;
}
+ public String getEndpointRuntimeStatisticsEnabled() {
+ return endpointRuntimeStatisticsEnabled;
+ }
+
+ public void setEndpointRuntimeStatisticsEnabled(String endpointRuntimeStatisticsEnabled) {
+ this.endpointRuntimeStatisticsEnabled = endpointRuntimeStatisticsEnabled;
+ }
+
public String getIncludeHostName() {
return includeHostName;
}
@@ -279,6 +293,9 @@ public class CamelJMXAgentDefinition extends IdentifiedType {
if (loadStatisticsEnabled != null) {
csb.append("loadStatisticsEnabled=" + loadStatisticsEnabled);
}
+ if (endpointRuntimeStatisticsEnabled != null) {
+ csb.append("endpointRuntimeStatisticsEnabled=" + endpointRuntimeStatisticsEnabled);
+ }
if (onlyRegisterProcessorWithCustomId != null) {
csb.append("onlyRegisterProcessorWithCustomId=" + onlyRegisterProcessorWithCustomId);
}
[3/3] camel git commit: Add component needed for testing
Posted by da...@apache.org.
Add component needed for testing
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61887fa2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61887fa2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61887fa2
Branch: refs/heads/master
Commit: 61887fa20481749897dd8e4d782c344ebdf3e972
Parents: 63b1699
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 28 15:21:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 15:21:49 2015 +0200
----------------------------------------------------------------------
components/camel-ahc/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/61887fa2/components/camel-ahc/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 578e397..1178cb4 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -65,6 +65,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-jetty8</artifactId>
<scope>test</scope>
</dependency>
[2/3] camel git commit: Fixed tests
Posted by da...@apache.org.
Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/63b16991
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/63b16991
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/63b16991
Branch: refs/heads/master
Commit: 63b169919e90f9e83ebd29eb02fbb8f9e105b129
Parents: 92b017c
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 28 11:28:16 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 11:28:16 2015 +0200
----------------------------------------------------------------------
...roducerRouteAddRemoveRegisterAlwaysTest.java | 9 ++--
.../management/ManagedRouteAddRemoveTest.java | 44 ++++++++++----------
2 files changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/63b16991/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index 606be4b..1b57d5a 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -29,6 +29,8 @@ import org.apache.camel.component.mock.MockEndpoint;
*/
public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementTestSupport {
+ private int services = 11;
+
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
@@ -47,7 +49,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -72,7 +74,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// but as its recipient list which is dynamic-to we add new producers because we have register always
namesP = mbeanServer.queryNames(onP, null);
@@ -87,14 +89,13 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// and we still have the other producers, but not the one from the 2nd route that was removed
namesP = mbeanServer.queryNames(onP, null);
assertEquals(4, namesP.size());
log.info("Shutting down...");
-
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/63b16991/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index ededf75..5429a1e 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -32,6 +32,8 @@ import org.apache.camel.component.mock.MockEndpoint;
* @version
*/
public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
+
+ private int services = 11;
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -59,7 +61,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -84,7 +86,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// but we should have one more producer
namesP = mbeanServer.queryNames(onP, null);
@@ -99,7 +101,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// and the 2nd producer should be removed
namesP = mbeanServer.queryNames(onP, null);
@@ -119,7 +121,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -144,7 +146,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// but as its recipient list which is dynamic-to we do not add a new producer
namesP = mbeanServer.queryNames(onP, null);
@@ -159,7 +161,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// and we still have the original producer
namesP = mbeanServer.queryNames(onP, null);
@@ -179,7 +181,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -204,7 +206,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// but as its recipient list which is dynamic-to we do not add a new producer
namesP = mbeanServer.queryNames(onP, null);
@@ -219,7 +221,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// and we still have the original producer
namesP = mbeanServer.queryNames(onP, null);
@@ -239,7 +241,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Adding 2nd route");
@@ -269,7 +271,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -281,7 +283,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Shutting down...");
}
@@ -297,7 +299,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Adding 2nd route");
@@ -328,7 +330,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -340,7 +342,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Shutting down...");
}
@@ -356,7 +358,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Adding 2nd route");
@@ -385,7 +387,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -397,7 +399,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Shutting down...");
}
@@ -413,7 +415,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Adding 2nd route");
@@ -443,7 +445,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -455,7 +457,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(10, names.size());
+ assertEquals(services, names.size());
log.info("Shutting down...");
}