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

GordonSmith · GordonSmith · commit e307f2761e97 · 2024-08-02T11:35:49.000+01:00
Signed-off-by: Gordon Smith &lt;GordonJSmith@gmail.com&gt;

# Conflicts:
#	commons-hpcc/pom.xml
#	dfsclient/pom.xml
#	pom.xml
#	wsclient/pom.xml
diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -986,6 +986,7 @@ else if (this.handle == 0)
             {
                 if (dataLen == 0)
                 {
+                    dataLen = dis.readInt(); // need to read addl int here ...
                     close();
                     return 0;
                 }

Original file line number	Diff line number	Diff line change
`@@ -986,6 +986,7 @@ else if (this.handle == 0)`
`986`	`986`	`{`
`987`	`987`	`if (dataLen == 0)`
`988`	`988`	`{`
	`989`	`+ dataLen = dis.readInt(); // need to read addl int here ...`
`989`	`990`	`close();`
`990`	`991`	`return 0;`
`991`	`992`	`}`