1 files changed, 14 insertions, 12 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index 89246376e4..de33ce8cfb 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -136,6 +136,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@@ -747,21 +748,22 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
   private void updateDeploymentFlavor(VspDetails vspDetails, String user) {
     final List<String> featureGroups = vspDetails.getFeatureGroups();
     if (featureGroups != null && !featureGroups.isEmpty() ) {
-      /*final Collection<DeploymentFlavorEntity> deploymentFlavorEntities =
-          listDeploymentFlavors(vspDetails.getId(), vspDetails.getVersion(), user);*/
-
       final Collection<DeploymentFlavorEntity> deploymentFlavorEntities = deploymentFlavorDao
           .list(new DeploymentFlavorEntity(vspDetails.getId(), vspDetails
           .getVersion(), null));
-      for (DeploymentFlavorEntity deploymentFlavorEntity : deploymentFlavorEntities) {
-        final String featureGroupId =
-            deploymentFlavorEntity.getDeploymentFlavorCompositionData().getFeatureGroupId();
-        if ( !featureGroups.contains(featureGroupId)) {
-          DeploymentFlavor deploymentFlavorCompositionData =
-              deploymentFlavorEntity.getDeploymentFlavorCompositionData();
-          deploymentFlavorCompositionData.setFeatureGroupId(null);
-          vendorSoftwareProductDao.updateDeploymentFlavor(deploymentFlavorEntity);
-        }
+      if (Objects.nonNull(deploymentFlavorEntities)) {
+        deploymentFlavorEntities.forEach(deploymentFlavorEntity -> {
+          final String featureGroupId =
+              deploymentFlavorEntity.getDeploymentFlavorCompositionData().getFeatureGroupId();
+          if ( !featureGroups.contains(featureGroupId)) {
+            DeploymentFlavor deploymentFlavorCompositionData =
+                deploymentFlavorEntity.getDeploymentFlavorCompositionData();
+            deploymentFlavorCompositionData.setFeatureGroupId(null);
+            deploymentFlavorEntity.setDeploymentFlavorCompositionData
+                (deploymentFlavorCompositionData);
+            vendorSoftwareProductDao.updateDeploymentFlavor(deploymentFlavorEntity);
+          }
+        });
       }
     }
   }