[camel] 01/02: CAMEL-14354: camel-core optimize

[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

commit 945548c4d1c45084aa1062c9a98cda2f8f7a4351
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jan 28 16:07:45 2020 +0100

    CAMEL-14354: camel-core optimize
---
 .../java/org/apache/camel/support/service/ServiceSupport.java  | 10 +++++-----
 .../test/java/org/apache/camel/support/ServiceSupportTest.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

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 7b2f780..2f8b04d 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
@@ -307,7 +307,7 @@ public abstract class ServiceSupport implements 
StatefulService {
 
     @Override
     public boolean isStopped() {
-        return status == NEW || status == INITIALIZED || status == BUILDED || 
status == STOPPED || status == SHUTTINGDOWN || status == SHUTDOWN || status == 
FAILED;
+        return status < STARTING || status >= STOPPED;
     }
 
     @Override
@@ -322,7 +322,7 @@ public abstract class ServiceSupport implements 
StatefulService {
 
     @Override
     public boolean isRunAllowed() {
-        return isStartingOrStarted() || isSuspendingOrSuspended();
+        return status >= STARTING && status <= SUSPENDED;
     }
 
     public boolean isShutdown() {
@@ -333,21 +333,21 @@ public abstract class ServiceSupport implements 
StatefulService {
      * Is the service in progress of being stopped or already stopped
      */
     public boolean isStoppingOrStopped() {
-        return isStopping() || isStopped();
+        return status < STARTING || status > SUSPENDED;
     }
 
     /**
      * Is the service in progress of being suspended or already suspended
      */
     public boolean isSuspendingOrSuspended() {
-        return isSuspending() || isSuspended();
+        return status == SUSPENDING || status == SUSPENDED;
     }
 
     /**
      * Is the service in progress of being suspended or already suspended
      */
     public boolean isStartingOrStarted() {
-        return isStarting() || isStarted();
+        return status == STARTING || status == STARTED;
     }
 
     /**
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
index c1655cd..ebed281 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
@@ -158,7 +158,7 @@ public class ServiceSupportTest extends TestSupport {
 
         public ServiceSupportTestExOnStart() {
             // just for testing force it to not be stopped
-            status = -1;
+            status = SUSPENDED;
         }
 
         @Override