From c175022feef510c9b7228c751f7d5db3da729351 Mon Sep 17 00:00:00 2001 From: Yavor16 Date: Tue, 12 Aug 2025 08:42:22 +0300 Subject: [PATCH] Fix Connection is closed problem --- .../validators/parameters/FileMimeTypeValidator.java | 11 ++++++----- .../controller/persistence/util/JdbcUtil.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidator.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidator.java index f8b1a5dbf4..70d224988e 100644 --- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidator.java +++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/validators/parameters/FileMimeTypeValidator.java @@ -34,16 +34,17 @@ public FileMimeTypeValidator(FileService fileService, DescriptorParserFacadeFact } public void validateFileType(String spaceGuid, String appArchiveId, Consumer stepLogger) { - try (InputStream fileInputStream = fileService.openInputStream(spaceGuid, appArchiveId); - InputStream inputStreamToValidate = (fileInputStream instanceof DBInputStream) - ? fileInputStream - : new BufferedInputStream(fileInputStream)) { - validateInputStreamMimeType(inputStreamToValidate, stepLogger); + try (InputStream fileInputStream = getInputStreamToValidate(fileService.openInputStream(spaceGuid, appArchiveId))) { + validateInputStreamMimeType(fileInputStream, stepLogger); } catch (FileStorageException | IOException e) { throw new SLException(e); } } + private InputStream getInputStreamToValidate(InputStream stream) { + return (stream instanceof DBInputStream) ? stream : new BufferedInputStream(stream); + } + private void validateInputStreamMimeType(InputStream uploadedFileInputStream, Consumer stepLogger) throws IOException { String detectedType = getFileMimeType(uploadedFileInputStream); diff --git a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/util/JdbcUtil.java b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/util/JdbcUtil.java index 48b7f37bc1..a1004a6c19 100644 --- a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/util/JdbcUtil.java +++ b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/util/JdbcUtil.java @@ -80,7 +80,7 @@ public static void rollback(Connection connection) throws SQLException { } public static void setAutoCommitSafely(Connection connection) throws SQLException { - if (connection != null) { + if (connection != null && !connection.isClosed()) { connection.setAutoCommit(true); } }