From: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>
Date: Thu, 21 Jan 2021 07:40:48 +0000 (+0100)
Subject: PNF CSAR onboarding still works if root CA is removed from SDC directory
X-Git-Tag: 1.8.1~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7ccd053b8fba4adb564677feabfecfb0f446559e;p=sdc.git

PNF CSAR onboarding still works if root CA is removed from SDC directory

Change-Id: I687c4b9e7e25ca254caefb1746ee6f0984a539a8
Issue-ID: SDC-3442
Signed-off-by: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>
---

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManager.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManager.java
index 56d0142e3b..006af058bb 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManager.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/security/SecurityManager.java
@@ -238,8 +238,12 @@ public class SecurityManager {
         return new File(certDirLocation);
     }
 
-    private X509Certificate loadCertificate(File certFile) throws SecurityManagerException, FileNotFoundException {
-        return loadCertificateFactory(new FileInputStream(certFile));
+    private X509Certificate loadCertificate(File certFile) throws SecurityManagerException  {
+        try (FileInputStream fi = new FileInputStream(certFile)) {
+            return loadCertificateFactory(fi);
+        } catch(IOException e) {
+            throw new SecurityManagerException("Error during loading Certificate from file!", e);
+        }
     }
 
     private X509Certificate loadCertificate(X509CertificateHolder cert) {