csolidum commented on code in PR #13052: URL: https://github.com/apache/kafka/pull/13052#discussion_r1060839550
########## connect/mirror/src/main/java/org/apache/kafka/connect/mirror/MirrorCheckpointTask.java: ########## @@ -189,14 +189,17 @@ private Map<TopicPartition, OffsetAndMetadata> listConsumerGroupOffsets(String g Optional<Checkpoint> checkpoint(String group, TopicPartition topicPartition, OffsetAndMetadata offsetAndMetadata) { - long upstreamOffset = offsetAndMetadata.offset(); - OptionalLong downstreamOffset = offsetSyncStore.translateDownstream(topicPartition, upstreamOffset); - if (downstreamOffset.isPresent()) { - return Optional.of(new Checkpoint(group, renameTopicPartition(topicPartition), + if (offsetAndMetadata != null) { + long upstreamOffset = offsetAndMetadata.offset(); + OptionalLong downstreamOffset = + offsetSyncStore.translateDownstream(topicPartition, upstreamOffset); + if (downstreamOffset.isPresent()) { + return Optional.of(new Checkpoint(group, renameTopicPartition(topicPartition), upstreamOffset, downstreamOffset.getAsLong(), offsetAndMetadata.metadata())); - } else { - return Optional.empty(); + } } + return Optional.empty(); + Review Comment: @mimaison Removed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org