[camel] branch master updated: Fixed test

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 02255b1  Fixed test
02255b1 is described below

commit 02255b1251a30e0f3ec199a824757a2b81274dbe
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Feb 26 15:38:15 2021 +0100

    Fixed test
---
 .../org/apache/camel/component/nats/NatsConsumerStopTest.java     | 4 ++++
 .../java/org/apache/camel/impl/engine/DefaultExchangeFactory.java | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java
 
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java
index dad43a7..7e67d7b 100644
--- 
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java
+++ 
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsConsumerStopTest.java
@@ -19,12 +19,16 @@ package org.apache.camel.component.nats;
 import org.apache.camel.Consumer;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test NATS consumer stop happens cleanly. See 
https://issues.apache.org/jira/browse/CAMEL-15834.
  */
 public class NatsConsumerStopTest extends CamelTestSupport {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(NatsConsumerStopTest.class);
+
     @Test
     public void testConsumerStop() throws Exception {
         NatsEndpoint endpoint = 
context.getEndpoint("nats:test?flushConnection=true", NatsEndpoint.class);
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExchangeFactory.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExchangeFactory.java
index e83a84e..efc595b 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExchangeFactory.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultExchangeFactory.java
@@ -157,12 +157,16 @@ public class DefaultExchangeFactory extends 
ServiceSupport implements ExchangeFa
 
     @Override
     protected void doStart() throws Exception {
-        exchangeFactoryManager.addExchangeFactory(this);
+        if (exchangeFactoryManager != null) {
+            exchangeFactoryManager.addExchangeFactory(this);
+        }
     }
 
     @Override
     protected void doStop() throws Exception {
-        exchangeFactoryManager.removeExchangeFactory(this);
+        if (exchangeFactoryManager != null) {
+            exchangeFactoryManager.removeExchangeFactory(this);
+        }
         logUsageSummary(LOG, "DefaultExchangeFactory", 0);
         statistics.reset();
     }