You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/12/20 17:45:40 UTC

(camel) branch main updated: CAMEL-20225: adjust DefaultRoute to use the StopWatch (#12511)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 36c0a9126b1 CAMEL-20225: adjust DefaultRoute to use the StopWatch (#12511)
36c0a9126b1 is described below

commit 36c0a9126b1aa4d75edeb0bb4949310bc3c17376
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Wed Dec 20 14:45:33 2023 -0300

    CAMEL-20225: adjust DefaultRoute to use the StopWatch (#12511)
---
 .../main/java/org/apache/camel/impl/engine/DefaultRoute.java | 12 +++++-------
 .../src/main/java/org/apache/camel/util/StopWatch.java       |  7 +++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
index d8ace10e795..7263f3df44a 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
@@ -59,6 +59,7 @@ import org.apache.camel.support.resume.AdapterHelper;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StopWatch;
 import org.apache.camel.util.TimeUtils;
 
 /**
@@ -106,7 +107,7 @@ public class DefaultRoute extends ServiceSupport implements Route {
     private final Endpoint endpoint;
     private final Map<String, Object> properties = new HashMap<>();
     private final List<Service> services = new ArrayList<>();
-    private long startDate;
+    private StopWatch stopWatch = new StopWatch(false);
     private RouteError routeError;
     private Integer startupOrder;
     private RouteController routeController;
@@ -156,10 +157,7 @@ public class DefaultRoute extends ServiceSupport implements Route {
 
     @Override
     public long getUptimeMillis() {
-        if (startDate == 0) {
-            return 0;
-        }
-        return System.currentTimeMillis() - startDate;
+        return stopWatch.taken();
     }
 
     @Override
@@ -247,13 +245,13 @@ public class DefaultRoute extends ServiceSupport implements Route {
 
     @Override
     protected void doStart() throws Exception {
-        startDate = System.currentTimeMillis();
+        stopWatch.restart();
     }
 
     @Override
     protected void doStop() throws Exception {
         // and clear start date
-        startDate = 0;
+        stopWatch.stop();
     }
 
     @Override
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/StopWatch.java b/core/camel-util/src/main/java/org/apache/camel/util/StopWatch.java
index a4b3945f61a..be49ceeba71 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/StopWatch.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/StopWatch.java
@@ -83,4 +83,11 @@ public final class StopWatch {
         return answer;
     }
 
+    /**
+     * Stops the stop watch
+     */
+    public void stop() {
+        start = 0;
+    }
+
 }