Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-9.4.x

GordonSmith · GordonSmith · commit fdac38a63d74 · 2024-08-02T11:35:27.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
@@ -896,6 +896,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
`@@ -896,6 +896,7 @@ else if (this.handle == 0)`
`896`	`896`	`{`
`897`	`897`	`if (dataLen == 0)`
`898`	`898`	`{`
	`899`	`+ dataLen = dis.readInt(); // need to read addl int here ...`
`899`	`900`	`close();`
`900`	`901`	`return 0;`
`901`	`902`	`}`