From 18f903ec7113b1248f2335e3e73b950455c02ccf Mon Sep 17 00:00:00 2001
From: Jake Smith <jake.smith@lexisnexisrisk.com>
Date: Fri, 13 Sep 2024 15:45:24 +0100
Subject: [PATCH 1/2] Split off 9.4.96

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
---
 commons-hpcc/pom.xml | 2 +-
 dfsclient/pom.xml    | 2 +-
 pom.xml              | 2 +-
 wsclient/pom.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml
index c64eef0c0..04b062447 100644
--- a/commons-hpcc/pom.xml
+++ b/commons-hpcc/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.hpccsystems</groupId>
     <artifactId>hpcc4j</artifactId>
-    <version>9.4.95-0-SNAPSHOT</version>
+    <version>9.4.97-0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml
index fcf7e3921..ca7b0009e 100644
--- a/dfsclient/pom.xml
+++ b/dfsclient/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.hpccsystems</groupId>
     <artifactId>hpcc4j</artifactId>
-    <version>9.4.95-0-SNAPSHOT</version>
+    <version>9.4.97-0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 880efc2de..1ca671799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hpccsystems</groupId>
   <artifactId>hpcc4j</artifactId>
-  <version>9.4.95-0-SNAPSHOT</version>
+  <version>9.4.97-0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>HPCC Systems Java Projects</name>
   <url>https://hpccsystems.com</url>
diff --git a/wsclient/pom.xml b/wsclient/pom.xml
index 23d8354cb..37fa5c79a 100644
--- a/wsclient/pom.xml
+++ b/wsclient/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.hpccsystems</groupId>
     <artifactId>hpcc4j</artifactId>
-    <version>9.4.95-0-SNAPSHOT</version>
+    <version>9.4.97-0-SNAPSHOT</version>
   </parent>
 
   <properties>

From 173207cccc868d9701b09625a188fa7ecab966f0 Mon Sep 17 00:00:00 2001
From: James McMullan <jpmcmu@gmail.com>
Date: Wed, 18 Sep 2024 13:37:36 -0400
Subject: [PATCH 2/2] HPCC4J-648 RowServiceInputStream available log prefix
 into closed block (#761)

Signed-off-by: James McMullan James.McMullan@lexisnexis.com
---
 .../org/hpccsystems/dfs/client/RowServiceInputStream.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 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
index 8fd9df9f1..2a298b6dd 100644
--- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
+++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java
@@ -1209,8 +1209,6 @@ private void compactBuffer()
     @Override
     public int available() throws IOException
     {
-        String prefix = "RowServiceInputStream.available(), file "   + dataPart.getFileName() + " part " + dataPart.getThisPart() + " on IP " + getIP() + ":";
-
         // Do the check for closed first here to avoid data races
         if (this.closed.get())
         {
@@ -1223,6 +1221,8 @@ public int available() throws IOException
             int availBytes = bufferLen - this.readPos;
             if (availBytes == 0)
             {
+                String prefix = "RowServiceInputStream.available(), file "   + dataPart.getFileName() + " part " + dataPart.getThisPart() + " on IP " + getIP() + ":";
+
                 // this.bufferWriteMutex.release();
                 throw new IOException(prefix + "End of input stream, bufferLen:" + bufferLen + ", this.readPos:" + this.readPos + ", availableBytes=0");
             }