From 100f6f45f8cc7f054e1d5627c134d9e6c7138248 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 28 Jun 2021 19:39:36 +0200
Subject: [PATCH] Some optimiziations for file upload code.

---
 .../assets/FileAssetEditStep.java             | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java
index 0bee5c9cb..7a4bab691 100644
--- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java
+++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java
@@ -32,6 +32,7 @@ import org.librecms.contentsection.AssetRepository;
 import org.librecms.ui.contentsections.AssetPermissionsChecker;
 import org.librecms.ui.contentsections.ContentSectionNotFoundException;
 
+import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -378,32 +379,28 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep {
                         }
                     }
 
-//                    try ( InputStream fileInputStream = Files.newInputStream(
-//                        tmpFilePath
-//                    )) {
-                        
-                        final Blob data = BlobProxy.generateProxy(
-                            Files.newInputStream(tmpFilePath), -1
-                        );
-                        fileAsset.setFileName(fileName);
-                        fileAsset.setData(data);
+                    final Blob data = BlobProxy.generateProxy(
+                        Files.newInputStream(tmpFilePath), -1
+                    );
+                    fileAsset.setFileName(fileName);
+                    fileAsset.setData(data);
 
-                        fileAsset.setSize(fileSize);
+                    fileAsset.setSize(fileSize);
 //                    fileAsset.setSize(fileAsset.getData().length);
-                        try {
-                            fileAsset.setMimeType(new MimeType(contentType));
-                        } catch (MimeTypeParseException ex) {
-                            LOGGER.error(
-                                "Failed to upload file for FileAsset {}:",
-                                assetPath
-                            );
-                            LOGGER.error(ex);
+                    try {
+                        fileAsset.setMimeType(new MimeType(contentType));
+                    } catch (MimeTypeParseException ex) {
+                        LOGGER.error(
+                            "Failed to upload file for FileAsset {}:",
+                            assetPath
+                        );
+                        LOGGER.error(ex);
 
-                            models.put("uploadFailed", true);
-                            return buildRedirectPathForStep();
-                        }
+                        models.put("uploadFailed", true);
+                        return buildRedirectPathForStep();
+                    }
 
-                        assetRepo.save(fileAsset);
+                    assetRepo.save(fileAsset);
 //                    }
 //                    try ( InputStream inputStream = inputPart.getBody(
 //                        InputStream.class, null)) {