From 0aa9091e406167a07257c93c935a70aaff84c866 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 16 Jun 2020 12:17:16 +0200
Subject: [PATCH] minor cleanup
---
.gitlab-ci.yml | 1 -
.../implementation/MySQL/MySQLRetrieveSparseEntity.java | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d7e94a3..c2c0f681 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@
# ** end header
#
-# TODO set DEPLOY_REF to dev after merge of f-feature-branch-pipeline
variables:
DEPLOY_REF: f-feature-branch-pipeline
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-server/caosdb-server-testenv:latest
diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
index 749b0b91..2aff2aae 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
@@ -51,13 +51,10 @@ public class MySQLRetrieveSparseEntity extends MySQLTransaction
final PreparedStatement preparedStatement = prepareStatement(stmtStr);
preparedStatement.setInt(1, id);
- final ResultSet rs = preparedStatement.executeQuery();
- try {
+ try (final ResultSet rs = preparedStatement.executeQuery()) {
if (rs.next()) {
return DatabaseUtils.parseEntityResultSet(rs);
}
- } finally {
- rs.close();
}
} catch (final SQLException e) {
throw new TransactionException(e);
--
GitLab