Fix Connection is closed problem

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<String> 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<String> stepLogger) throws IOException {
         String detectedType = getFileMimeType(uploadedFileInputStream);
 

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);
         }
     }