This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 5daf3c996afcd2ee5bafa99b39f08e17eb26b456 Author: Christian Schneider <[email protected]> AuthorDate: Wed Jun 28 18:17:16 2023 +0200 SLING-11914 - Use correct message --- pom.xml | 2 +- .../distribution/journal/impl/subscriber/DistributionSubscriber.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6cdbf83..14ffd82 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ <properties> <sling.java.version>8</sling.java.version> - <project.build.outputTimestamp>1651650192</project.build.outputTimestamp> + <project.build.outputTimestamp>1687958134</project.build.outputTimestamp> </properties> <scm> diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java index 2e758a4..28c503e 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java @@ -69,6 +69,7 @@ import org.apache.sling.distribution.journal.bookkeeper.BookKeeperFactory; import org.apache.sling.distribution.journal.impl.precondition.Precondition; import org.apache.sling.distribution.journal.impl.precondition.Precondition.Decision; import org.apache.sling.distribution.journal.messages.LogMessage; +import org.apache.sling.distribution.journal.messages.OffsetMessage; import org.apache.sling.distribution.journal.messages.PackageMessage; import org.apache.sling.distribution.journal.messages.PackageStatusMessage; import org.apache.sling.distribution.journal.messages.PingMessage; @@ -209,7 +210,7 @@ public class DistributionSubscriber { String assign = startOffset > 0 ? messagingProvider.assignTo(startOffset) : null; packagePoller = messagingProvider.createPoller(topics.getPackageTopic(), Reset.latest, assign, - HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage), HandlerAdapter.create(PingMessage.class, this::handlePingMessage)); + HandlerAdapter.create(PackageMessage.class, this::handlePackageMessage), HandlerAdapter.create(OffsetMessage.class, this::handleOffsetMessage)); queueThread = startBackgroundThread(this::processQueue, format("Queue Processor for Subscriber agent %s", subAgentName)); @@ -283,7 +284,7 @@ public class DistributionSubscriber { } } - private <T extends Object> void handlePingMessage(MessageInfo info, PingMessage message) { + private void handleOffsetMessage(MessageInfo info, OffsetMessage message) { bookKeeper.handleInitialOffset(info.getOffset()); }
