This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws-sdk-2.20.131 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b44b4b4fc73c6dd9cae1ba22a29cc7148a79d5b Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Aug 23 06:40:19 2023 +0200 Regen Signed-off-by: Andrea Cosentino <anco...@gmail.com> --- .../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 2 -- .../src/main/java/org/apache/camel/impl/engine/VersionHolder.java | 4 +--- .../main/java/org/apache/camel/main/MainDurationEventNotifier.java | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index 97f945a6a76..7a771fd0425 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -1906,13 +1906,11 @@ public abstract class AbstractCamelContext extends BaseService return new Date(startDate); } - @Override public String getVersion() { return VersionHolder.VERSION; } - @Override protected void doSuspend() throws Exception { EventHelper.notifyCamelContextSuspending(this); diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java index a15943b6501..9190d562386 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/VersionHolder.java @@ -24,8 +24,7 @@ import org.apache.camel.util.IOHelper; class VersionHolder { public static final String VERSION; - private static final String POM_PROPERTIES = - "/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties"; + private static final String POM_PROPERTIES = "/META-INF/maven/org.apache.camel/camel-base-engine/pom.properties"; static { VERSION = doGetVersion(); @@ -68,7 +67,6 @@ class VersionHolder { } } - if (resolvedVersion == null) { // we could not compute the version so use a blank resolvedVersion = ""; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java index daecdbffeea..7b6c6e52b31 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java @@ -96,7 +96,8 @@ public class MainDurationEventNotifier extends EventNotifierSupport { boolean complete = false; if (maxMessages > 0) { - complete = event.getType() == CamelEvent.Type.ExchangeCompleted || event.getType() == CamelEvent.Type.ExchangeFailed; + complete = event.getType() == CamelEvent.Type.ExchangeCompleted + || event.getType() == CamelEvent.Type.ExchangeFailed; if (complete) { boolean result = doneMessages.incrementAndGet() >= maxMessages;