Merge "Fixed a few static analysis violations"

1 files changed, 7 insertions, 9 deletions

diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
index 07322c626b..f4d6209eec 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
@@ -59,26 +59,24 @@ public class CommonUtil {
   private static FileContentHandler getFileContentMapFromOrchestrationCandidateZipAndValidateNoFolders(
       byte[] uploadFileData)
       throws IOException {
-    ZipEntry zipEntry;
+
     List<String> folderList = new ArrayList<>();
     FileContentHandler mapFileContent = new FileContentHandler();
-    try {
-      ZipInputStream inputZipStream;
 
-      byte[] fileByteContent;
+    try (ZipInputStream inputZipStream = new ZipInputStream(new ByteArrayInputStream(uploadFileData))) {
+
       String currentEntryName;
-      inputZipStream = new ZipInputStream(new ByteArrayInputStream(uploadFileData));
+      ZipEntry zipEntry;
 
       while ((zipEntry = inputZipStream.getNextEntry()) != null) {
-        currentEntryName = zipEntry.getName();
-        // else, get the file content (as byte array) and save it in a map.
-        fileByteContent = FileUtils.toByteArray(inputZipStream);
 
+        currentEntryName = zipEntry.getName();
         int index = lastIndexFileSeparatorIndex(currentEntryName);
         if (index != -1) { //todo ?
           folderList.add(currentEntryName);
         } else {
-          mapFileContent.addFile(currentEntryName, fileByteContent);
+          // else, get the file content (as byte array) and save it in a map.
+          mapFileContent.addFile(currentEntryName, FileUtils.toByteArray(inputZipStream));
         }
       }