Repository: incubator-unomi Updated Branches: refs/heads/master cae1d4a60 -> d19be2215
UNOMI-101 : Update inactive routes Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/d19be221 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/d19be221 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/d19be221 Branch: refs/heads/master Commit: d19be22158f31d539528d8772006d10f3bc77a1a Parents: cae1d4a Author: Abdelkader Midani <amid...@apache.org> Authored: Sat Jun 24 06:44:43 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Sat Jun 24 06:44:43 2017 +0200 ---------------------------------------------------------------------- .../unomi/router/core/context/ProfileImportCamelContext.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d19be221/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java index 9bb50f8..7942f02 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java @@ -20,6 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Route; import org.apache.camel.component.jackson.JacksonDataFormat; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.model.RouteDefinition; import org.apache.unomi.router.api.ImportConfiguration; import org.apache.unomi.router.api.services.ImportConfigurationService; import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor; @@ -107,10 +108,17 @@ public class ProfileImportCamelContext implements SynchronousBundleListener { } public void updateProfileImportReaderRoute(ImportConfiguration importConfiguration) throws Exception { + //Active routes Route route = camelContext.getRoute(importConfiguration.getItemId()); if (route != null && stopRoute(importConfiguration.getItemId())) { camelContext.removeRoute(importConfiguration.getItemId()); } + + //Inactive routes + RouteDefinition routeDefinition = camelContext.getRouteDefinition(importConfiguration.getItemId()); + if (routeDefinition != null) { + camelContext.removeRouteDefinition(routeDefinition); + } //Handle transforming an import config oneshot <--> recurrent if (IMPORT_CONFIG_TYPE_RECURRENT.equals(importConfiguration.getConfigType())) { ProfileImportFromSourceRouteBuilder builder = new ProfileImportFromSourceRouteBuilder(kafkaProps, configType);
