[camel] 01/01: [CAMEL-17618]follow up fix and re-enable failure test

[ffang]

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

ffang pushed a commit to branch CAMEL-17618-2
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 121ae617019f5dc53eea57479d05f84d1eafc7fc
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Fri Feb 11 11:24:51 2022 -0500

    [CAMEL-17618]follow up fix and re-enable failure test
---
 .../org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java   | 2 --
 .../src/main/java/org/apache/camel/component/ref/RefEndpoint.java      | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index e2a85af..27e3749 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.util.IOHelper;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -66,7 +65,6 @@ public abstract class AbstractCXFGreeterRouterTest extends 
CamelSpringTestSuppor
     }
 
     @Test
-    @Disabled
     public void testInvokingServiceFromCXFClient() throws Exception {
         Service service = Service.create(serviceName);
         service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/";,
diff --git 
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
 
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
index caef53d8..07f8859 100644
--- 
a/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
+++ 
b/components/camel-ref/src/main/java/org/apache/camel/component/ref/RefEndpoint.java
@@ -77,7 +77,8 @@ public class RefEndpoint extends DefaultEndpoint implements 
DelegateEndpoint {
         if (endpoint == null) {
             // endpoint is mandatory
             endpoint = CamelContextHelper.mandatoryLookup(getCamelContext(), 
name, Endpoint.class);
-            if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) 
== null) {
+            if (getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) 
== null
+                    || 
getCamelContext().getEndpoint(getEndpoint().getEndpointUri()) != endpoint) {
                 getCamelContext().addEndpoint(getEndpoint().getEndpointUri(), 
endpoint);
             }
         }