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/03/31 10:53:30 UTC
[6/7] camel git commit: Revert "CAMEL-8562: Removing a route - Should
check if the route input endpoint is static and used by other routes"
Revert "CAMEL-8562: Removing a route - Should check if the route input endpoint is static and used by other routes"
This reverts commit 166c0be906aec697b6c5e6ef9c756510f64a94a2.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ec52d90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ec52d90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ec52d90
Branch: refs/heads/camel-2.15.x
Commit: 2ec52d900621b89ca4bc350db3c02d524857d1dd
Parents: 360499f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 31 10:38:21 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 31 10:55:35 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/RouteService.java | 5 -----
.../Endpoint2MustBeStartedBeforeSendProcessorTest.java | 2 --
.../processor/EndpointMustBeStartedBeforeSendProcessorTest.java | 2 --
3 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec52d90/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
index 32bb3f5..2139d5c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
@@ -140,11 +140,6 @@ public class RouteService extends ChildServiceSupport {
// endpoints should only be started once as they can be reused on other routes
// and whatnot, thus their lifecycle is to start once, and only to stop when Camel shutdown
for (Route route : routes) {
- // ensure endpoints is registered in the registry
- String uri = route.getEndpoint().getEndpointUri();
- if (camelContext.hasEndpoint(uri) == null) {
- camelContext.addEndpoint(uri, route.getEndpoint());
- }
// ensure endpoint is started first (before the route services, such as the consumer)
ServiceHelper.startService(route.getEndpoint());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec52d90/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java b/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
index 637c80a..29cfb68 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/Endpoint2MustBeStartedBeforeSendProcessorTest.java
@@ -95,8 +95,6 @@ public class Endpoint2MustBeStartedBeforeSendProcessorTest extends ContextTestSu
});
context.start();
- assertTrue("Should be static endpoint", context.getEndpointRegistry().isStatic(myendpoint.getEndpointKey()));
-
assertEquals("EndpointProducerConsumer", order);
order = "";
http://git-wip-us.apache.org/repos/asf/camel/blob/2ec52d90/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java b/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
index 0e3a347..19cd537 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/EndpointMustBeStartedBeforeSendProcessorTest.java
@@ -95,8 +95,6 @@ public class EndpointMustBeStartedBeforeSendProcessorTest extends ContextTestSup
});
context.start();
- assertTrue("Should be static endpoint", context.getEndpointRegistry().isStatic(myendpoint.getEndpointKey()));
-
assertEquals("EndpointProducerConsumer", order);
order = "";