Repository: camel Updated Branches: refs/heads/camel-2.15.x 638412189 -> cca30b2f2 refs/heads/master 17c39eaf1 -> 25c2a0f11
CAMEL-8841: camel:context-inflight returns 'Object name cannot be null'. Thanks to Martin Lichtin for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25c2a0f1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25c2a0f1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25c2a0f1 Branch: refs/heads/master Commit: 25c2a0f111311493387b61e6198915a5d61689d2 Parents: 17c39ea Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jun 15 13:17:21 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jun 15 13:17:21 2015 +0200 ---------------------------------------------------------------------- .../apache/camel/commands/AbstractLocalCamelController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/25c2a0f1/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java index 1a08445..418013c 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java @@ -178,11 +178,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll ManagementAgent agent = context.getManagementStrategy().getManagementAgent(); if (agent != null) { MBeanServer mBeanServer = agent.getMBeanServer(); - ObjectName on = null; - Set<ObjectName> set = mBeanServer.queryNames(new ObjectName(agent.getMBeanObjectDomainName() + ":type=services,name=DefaultInflightRepository,*"), null); - if (set.size() == 1) { - on = set.iterator().next(); - } + ObjectName on = new ObjectName(agent.getMBeanObjectDomainName() + ":type=services,name=DefaultInflightRepository,context=" + context.getManagementName()); if (mBeanServer.isRegistered(on)) { TabularData list = (TabularData) mBeanServer.invoke(on, "browse", new Object[]{limit, sortByLongestDuration}, new String[]{"int", "boolean"}); Collection<CompositeData> values = (Collection<CompositeData>) list.values();
