[camel] 06/13: camel-core - Optimize to let type converter be eager created to avoid overhead in getTypeConverter method which is used a lot.

[da...@apache.org]

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

commit 53acc37eb40e2429cfb5f095ce39bc70b8a9b263
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Feb 16 08:32:51 2020 +0100

    camel-core - Optimize to let type converter be eager created to avoid overhead in getTypeConverter method which is used a lot.
---
 .../camel/component/quartz/QuartzOneCamelContextRestartTest.java    | 4 ++--
 .../main/java/org/apache/camel/support/service/ServiceSupport.java  | 6 +++---
 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java     | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
index d372e89..d842ba8 100644
--- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzOneCamelContextRestartTest.java
@@ -51,14 +51,14 @@ public class QuartzOneCamelContextRestartTest {
         mock1.expectedMinimumMessageCount(2);
         mock1.assertIsSatisfied();
 
+        // restart
         camel1.stop();
+        camel1.start();
 
         // fetch mock endpoint again because we have stopped camel context
         mock1 = camel1.getEndpoint("mock:one", MockEndpoint.class);
         // should resume triggers when we start camel 1 again
         mock1.expectedMinimumMessageCount(3);
-        camel1.start();
-
         mock1.assertIsSatisfied();
     }
 
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
index 7602c73..8c9fc4e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
@@ -74,10 +74,10 @@ public abstract class ServiceSupport implements StatefulService {
 
     @Override
     public void init() {
-        // allow to initialize again if failed
-        if (status <= BUILDED || status >= FAILED) {
+        // allow to initialize again if stopped or failed
+        if (status <= BUILDED || status >= STOPPED) {
             synchronized (lock) {
-                if (status <= BUILDED || status >= FAILED) {
+                if (status <= BUILDED || status >= STOPPED) {
                     LOG.trace("Initializing service: {}", this);
                     try {
                         doInit();
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 58c1594..fe96711 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -834,6 +834,7 @@ public abstract class AbstractCamelContext extends ServiceSupport implements Ext
 
     @Override
     public Endpoint getEndpoint(String uri, Map<String, Object> parameters) {
+        // ensure CamelContext are initialized before we can get an endpoint
         init();
 
         StringHelper.notEmpty(uri, "uri");