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/26 14:56:11 UTC

[2/4] camel git commit: CAMEL-9019: ManagedRuntimeEndpointRegistry was not enlisted in JMX

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/4f5c1d3a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f5c1d3a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f5c1d3a

Branch: refs/heads/master
Commit: 4f5c1d3ae61cf2d280f1217671e1db3f4101c2b9
Parents: a383842
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 26 14:45:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 26 14:45:56 2015 +0200

----------------------------------------------------------------------
 .../camel/management/DefaultManagementLifecycleStrategy.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4f5c1d3a/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 7d0f922..ab4db16 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);