diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d7e94a35f3f37a2c92a8d0c17e278b59389dbcd..c2c0f681f4312a1b075a1f1ae68ca1bbca5ddc60 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 749b0b91455c9f429821bbabce3aa99375a417cd..2aff2aaedda70672eb676597a2e3ba7a1db14352 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);