From 73eb881955856ebd9aac61c96a1aed7098ca9563 Mon Sep 17 00:00:00 2001 From: Murali Shankar Date: Thu, 4 Jul 2024 20:57:56 -0700 Subject: [PATCH 1/3] The first PV name is duplicated in the query string --- .../archiverappliance/retrieval/client/RawDataRetrieval.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java index 5a87177..b4db5ff 100644 --- a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java +++ b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java @@ -60,7 +60,7 @@ public final GenMsgIterator getDataForPVs( } else { buf.append("?pv=").append(first_encoded); } - for (var pvName : pvNames) { + for (var pvName : pvNames.subList(1, pvNames.size())) { buf.append("&pv=").append(URLEncoder.encode(pvName, StandardCharsets.UTF_8)); } buf.append("&from=").append(convertToUTC(startTime)).append("&to=").append(convertToUTC(endTime)); From d22bef251d637cd70bd63d6f34c7de0d751db0dd Mon Sep 17 00:00:00 2001 From: Murali Shankar Date: Thu, 4 Jul 2024 20:58:29 -0700 Subject: [PATCH 2/3] Checking for inputstream availability does not work here; so we always return null --- .../archiverappliance/retrieval/client/RawDataRetrieval.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java index b4db5ff..6521f95 100644 --- a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java +++ b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java @@ -87,10 +87,6 @@ public final GenMsgIterator getDataForPVs( return null; } InputStream is = response.body(); - if (is.available() <= 0) { - logger.warning("Empty response from server when fetching data from " + getURL); - return null; - } return new InputStreamBackedGenMsg(is); } catch (Exception ex) { From b5fcda87bdaa351cb1e73518bc7d20d5553bf9d2 Mon Sep 17 00:00:00 2001 From: Murali Shankar Date: Thu, 4 Jul 2024 20:59:21 -0700 Subject: [PATCH 3/3] Update version --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 075821e..9142bf1 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -15,7 +15,7 @@ plugins { id("maven-publish") } -version = '0.2.0' +version = '0.2.1' java { toolchain {