From ddd1badb175e660c8a52120443abd57a9a3a7aa6 Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 15 Nov 2021 17:34:32 +0000 Subject: Fix potential NPE Signed-off-by: Vasyl Razinkov Change-Id: I9138d498fce81692b286ec01b75e94e029b06c95 Issue-ID: SDC-3785 --- .../src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java | 2 +- .../openecomp/sdc/vendorsoftwareproduct/security/SecurityManager.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java index d120b3af8d..2be7b10118 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/StorageFactory.java @@ -85,7 +85,7 @@ public class StorageFactory { return curr; } } - return null; + return NONE; } } } 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 53728c0489..e6fcaff712 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 @@ -89,7 +89,6 @@ public class SecurityManager { private static final Logger LOGGER = LoggerFactory.getLogger(SecurityManager.class); private static final String UNEXPECTED_ERROR_OCCURRED_DURING_SIGNATURE_VALIDATION = "Unexpected error occurred during signature validation!"; private static final String COULD_NOT_VERIFY_SIGNATURE = "Could not verify signature!"; - private static final String EXTERNAL_CSAR_STORE = "externalCsarStore"; static { if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { -- cgit 1.2.3-korg