You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2021/10/29 16:48:29 UTC
[sis] 01/03: Add a check against closed result sets.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit bbde15bb91105865fdce9c442ade020578e7a9b3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Oct 29 15:53:15 2021 +0200
Add a check against closed result sets.
---
.../src/main/java/org/apache/sis/metadata/sql/CachedStatement.java | 4 ++--
.../src/main/java/org/apache/sis/metadata/sql/package-info.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
index 76f6821..ce862e9 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/CachedStatement.java
@@ -47,7 +47,7 @@ import org.apache.sis.internal.system.Loggers;
* the {@code CachedStatement} instance. This object is closed by a background thread of {@link MetadataSource}.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @version 1.0
+ * @version 1.2
* @since 0.8
* @module
*/
@@ -151,7 +151,7 @@ final class CachedStatement implements AutoCloseable {
private void closeResultSet() throws SQLException {
final ResultSet r = results;
results = null; // Make sure that this field is cleared even if an exception occurs below.
- if (r != null) {
+ if (r != null && !r.isClosed()) {
final boolean hasNext = r.next();
r.close();
if (hasNext) {
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/package-info.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/package-info.java
index 14e4bc0..9c64d33 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/package-info.java
@@ -42,7 +42,7 @@
*
* @author Touraïvane (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
- * @version 1.1
+ * @version 1.2
*
* @see org.apache.sis.referencing.factory.sql
*