Repository: camel Updated Branches: refs/heads/camel-2.15.x ee12b67fa -> 2bbedff8d
CAMEL-9019: ManagedRuntimeEndpointRegistry was not enlisted in JMX Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/312e6bcf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/312e6bcf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/312e6bcf Branch: refs/heads/camel-2.15.x Commit: 312e6bcf79370b590813dc65c51963e444b316da Parents: ee12b67 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jul 26 14:45:56 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jul 26 15:04:07 2015 +0200 ---------------------------------------------------------------------- .../camel/management/DefaultManagementLifecycleStrategy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/312e6bcf/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java index 4834d64..7e75dd9 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java @@ -449,8 +449,6 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement managedBacklogDebuggers.put(backlogDebugger, md); } return md; - } else if (service instanceof EventNotifier) { - answer = getManagementObjectStrategy().getManagedObjectForEventNotifier(context, (EventNotifier) service); } else if (service instanceof Producer) { answer = getManagementObjectStrategy().getManagedObjectForProducer(context, (Producer) service); } else if (service instanceof Consumer) { @@ -478,6 +476,8 @@ public class DefaultManagementLifecycleStrategy extends ServiceSupport implement answer = new ManagedRuntimeEndpointRegistry(context, (RuntimeEndpointRegistry) service); } else if (service instanceof StreamCachingStrategy) { answer = new ManagedStreamCachingStrategy(context, (StreamCachingStrategy) service); + } else if (service instanceof EventNotifier) { + answer = getManagementObjectStrategy().getManagedObjectForEventNotifier(context, (EventNotifier) service); } else if (service != null) { // fallback as generic service answer = getManagementObjectStrategy().getManagedObjectForService(context, service);
