You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/10/12 11:26:41 UTC

[camel] 37/44: Trivial cleanup

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ddb6d5a8c3fc79b67a5bf1c66e40698cc2003095
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Oct 8 16:59:55 2018 +0200

    Trivial cleanup
---
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java  | 8 ++------
 .../java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java  | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index c57963b..1d415c6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -3255,11 +3255,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
 
         // start management strategy before lifecycles are started
         ManagementStrategy managementStrategy = getManagementStrategy();
-        // inject CamelContext if aware
-        if (managementStrategy instanceof CamelContextAware) {
-            ((CamelContextAware) managementStrategy).setCamelContext(this);
-        }
-        ServiceHelper.startService(managementStrategy);
+        startService(managementStrategy);
 
         // start lifecycle strategies
         ServiceHelper.startService(lifecycleStrategies);
@@ -3287,7 +3283,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
                 }
             }
             if (notifier instanceof Service) {
-                startService((Service)notifier);
+                startService((Service) notifier);
             }
         }
 
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
index 273e2df..521d71a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
@@ -19,6 +19,7 @@ package org.apache.camel.impl.cluster;
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.RouteDefinition;
 
+@FunctionalInterface
 public interface ClusteredRouteFilter {
     /**
      * Test if the route should be clustered or not.