From d38e2009273fd8cb5dc92a4c34d2497b62da8997 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Sat, 26 Oct 2024 16:27:40 +0200
Subject: [PATCH] bugfix for symptom: no VOTable returned if no datasets found;
however should return empty VOTable
---
data-discovery/src/main/java/search/DbObstap.java | 2 +-
.../main/java/webapi/formatfilter/FormatResponseFilter.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data-discovery/src/main/java/search/DbObstap.java b/data-discovery/src/main/java/search/DbObstap.java
index 513c9fe..53db2f2 100644
--- a/data-discovery/src/main/java/search/DbObstap.java
+++ b/data-discovery/src/main/java/search/DbObstap.java
@@ -218,7 +218,7 @@ public class DbObstap
LOGGER.fine("Connecting to: " + dbConnArgs.uri()
+ " with optional user/pwd: " + dbConnArgs.userName() +" / "+ dbConnArgs.password() );
- try(
+ try(
Connection conn = DriverManager.getConnection(dbConnArgs.uri(), dbConnArgs.userName(), dbConnArgs.password());
Statement st = conn.createStatement();
ResultSet res = st.executeQuery(theQuery);)
diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
index 85af520..5143cbc 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
@@ -56,7 +56,7 @@ public class FormatResponseFilter implements Filter
String[] pubdidArr = responseWrapper.getPubdidArr();
- if ((pubdidArr != null) && (pubdidArr.length > 0))
+ if (pubdidArr != null)
{
PrintWriter responseWriter = ((HttpServletResponse)response).getWriter();
@@ -81,7 +81,7 @@ public class FormatResponseFilter implements Filter
}
else
{
- LOGGER.fine("SearchServlet returned no ID's.");
+ LOGGER.warning("SearchServlet returned null pubdidArr.");
}
}
catch(MultiValuedParamNotSupported ex)
--
GitLab