[camel] 08/08: Merge branch 'CAMEL-13371'

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a291535d6d80c6c94d311ad522261bf51fc762e5
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue May 21 10:23:58 2019 +0200

    Merge branch 'CAMEL-13371'
    
    # Conflicts:
    #   
components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixReifier.java
    #   
core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java
    #   
core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
    #   
core/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
    #   
core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
    #   core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
    #   core/camel-core/src/main/java/org/apache/camel/reifier/StepReifier.java
---
 .../src/test/java/org/apache/camel/spring/EndpointReferenceTest.java  | 4 +++-
 core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
 
b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
index eed26b8..117f0b0 100644
--- 
a/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
+++ 
b/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
+import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.engine.DefaultRouteContext;
@@ -75,7 +76,8 @@ public class EndpointReferenceTest extends SpringTestSupport {
     public void testReferenceEndpointFromOtherCamelContext() throws Exception {
         CamelContext context = applicationContext.getBean("camel2", 
CamelContext.class);
         RouteDefinition route = new RouteDefinition("temporary");
-        RouteContext routeContext = new DefaultRouteContext(context, route, 
route.idOrCreate(context.getNodeIdFactory()));
+        String routeId = 
route.idOrCreate(context.adapt(ExtendedCamelContext.class).getNodeIdFactory());
+        RouteContext routeContext = new DefaultRouteContext(context, route, 
routeId);
         try {
             routeContext.resolveEndpoint(null, "endpoint1");
             fail("Should have thrown exception");
diff --git 
a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java 
b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
index af12707..a921e33 100644
--- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
+++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
@@ -301,7 +301,7 @@ public class DefaultModel implements Model {
         AbstractCamelContext mcc = 
camelContext.adapt(AbstractCamelContext.class);
         mcc.setStartingRoutes(true);
         try {
-            String id = 
routeDefinition.idOrCreate(camelContext.getNodeIdFactory());
+            String id = 
routeDefinition.idOrCreate(camelContext.adapt(ExtendedCamelContext.class).getNodeIdFactory());
             RouteContext routeContext = new DefaultRouteContext(camelContext, 
routeDefinition, id);
             Route route = new 
RouteReifier(routeDefinition).createRoute(camelContext, routeContext);
             RouteService routeService = new RouteService(route);