read till end-of-file

apache · Mar 30, 2024 · 19ec489 · dsmiley · Mar 30, 2024 · 19ec489
1 parent 4c16404
commit 19ec489
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -1817,6 +1817,9 @@ private int fetchPackets(FastInputStream fis) throws Exception {
       boolean isContentReceived = false;
       try {
         while (true) {
+          if(fis.peek() == -1){
+            return NO_CONTENT;
+          }
           if (stop) {
             stop = false;
             aborted = true;
@@ -1825,13 +1828,11 @@ private int fetchPackets(FastInputStream fis) throws Exception {
           long checkSumServer = -1;
 
           fis.readFully(intbytes);
-
           // read the size of the packet
           int packetSize = readInt(intbytes);
           if (packetSize <= 0) {
-            fis.read(); // read till end-of-file
             if (!isContentReceived) log.warn("No content received for file: {}", fileName);
-            return NO_CONTENT;
+            continue;
           }
           isContentReceived = true;
           // TODO consider recoding the remaining logic to not use/need buf[]; instead use the