Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # commons-hpcc/pom.xml # dfsclient/pom.xml # pom.xml # wsclient/pom.xml
hpcc-systems · Aug 8, 2024 · 5e27b6e · 5e27b6e
2 parents d011569 + c4695d3
commit 5e27b6e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -922,9 +922,6 @@ private int startFetch()
             {
                 try
                 {
-                    // Read handle before closing
-                    this.dis.readInt();
-
                     close();
                 }
                 catch (IOException e)
@@ -986,7 +983,8 @@ else if (this.handle == 0)
             {
                 if (dataLen == 0)
                 {
-                    dataLen = dis.readInt(); // need to read addl int here ...
+                    // Read handle before closing
+                    dis.readInt();
                     close();
                     return 0;
                 }