From 1fe17350e13d0f448512731f99dcb8c2c6220e47 Mon Sep 17 00:00:00 2001
From: lujie64 <lujie64@jd.com>
Date: Fri, 27 Mar 2026 20:19:33 +0800
Subject: [PATCH] [hotfix] Check if batches is empty to prevent readNextOffset
 from throwing NoSuchElementException.

---
 .../src/main/java/org/apache/fluss/server/log/LogSegment.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
index c45c25e5c9..4c18b33c88 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
@@ -411,6 +411,9 @@ public long readNextOffset() throws IOException {
             return baseOffset;
         } else {
             Iterable<LogRecordBatch> batches = fetchData.getRecords().batches();
+            if (Iterables.isEmpty(batches)) {
+                return baseOffset;
+            }
             LogRecordBatch lastBatch = Iterables.getLast(batches);
             if (lastBatch != null) {
                 return lastBatch.nextLogOffset();