From da135fb3890c5ad69a9813136bc0f6062870ed71 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 2 Aug 2024 11:47:49 +0100 Subject: [PATCH 1/4] Split off 9.2.110 Signed-off-by: Gordon Smith --- 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 054884934..1cdf16140 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.109-0-SNAPSHOT + 9.2.111-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 9047c3c74..85ec71575 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.109-0-SNAPSHOT + 9.2.111-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 628593f7b..4f08187cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.109-0-SNAPSHOT + 9.2.111-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index bd0fef769..a582edddd 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.109-0-SNAPSHOT + 9.2.111-0-SNAPSHOT From 83ee5762f5cdc0791e89220e025d052f9f672d08 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 2 Aug 2024 11:50:46 +0100 Subject: [PATCH 2/4] Split off 9.6.36 Signed-off-by: Gordon Smith --- 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 3f331a897..b6ef5cb7f 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.35-0-SNAPSHOT + 9.6.37-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 900839a51..7e5bf65f4 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.35-0-SNAPSHOT + 9.6.37-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8fe00b4f3..5aa34098d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.6.35-0-SNAPSHOT + 9.6.37-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index c0917830a..3285d4b36 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.6.35-0-SNAPSHOT + 9.6.37-0-SNAPSHOT From 536f4e114760cb7e26f23460a20c857a14dc5f1e Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 2 Aug 2024 11:51:49 +0100 Subject: [PATCH 3/4] Split off 9.4.84 Signed-off-by: Gordon Smith --- 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 2ae567f94..87f5db593 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.83-0-SNAPSHOT + 9.4.85-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index be9d1d605..97dce5969 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.83-0-SNAPSHOT + 9.4.85-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index c3877eda2..e01d9b1e9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.83-0-SNAPSHOT + 9.4.85-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index b78fbb907..92e2e1f3c 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.83-0-SNAPSHOT + 9.4.85-0-SNAPSHOT From 76ab9f4bda4fb0f78e02d81198fbf301613de69a Mon Sep 17 00:00:00 2001 From: James McMullan Date: Fri, 2 Aug 2024 09:31:23 -0400 Subject: [PATCH 4/4] HPCC4J-624 RowServiceInputStream handle read before close cleanup (#738) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../org/hpccsystems/dfs/client/RowServiceInputStream.java | 6 ++---- 1 file changed, 2 insertions(+), 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 index 50b0e10c5..3a8b26b77 100644 --- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java +++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java @@ -825,9 +825,6 @@ private int startFetch() { try { - // Read handle before closing - this.dis.readInt(); - close(); } catch (IOException e) @@ -889,7 +886,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; }