Bugfixes for December 2018

[so.git] / bpmn / so-bpmn-infrastructure-common / src / main / groovy / org / onap / so / bpmn / infrastructure / scripts / DoDeleteVnf.groovy

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteVnf.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
index 456a9cf..47a4d55 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteVnf.groovy
@@ -118,8 +118,12 @@ class DoDeleteVnf extends AbstractServiceTaskProcessor {
                                }
 
                                Optional<GenericVnf> vnf = wrapper.asBean(GenericVnf.class)
-                               if(!vnf.get().getVfModules().getVfModule().isEmpty()){
-                                       execution.setVariable("DoDVNF_vnfInUse", true)
+                               if (vnf.get() != null) {
+                                       if (vnf.get().getVfModules() != null) {
+                                               if((vnf.get().getVfModules().getVfModule() != null) && !vnf.get().getVfModules().getVfModule().isEmpty()){                      
+                                                       execution.setVariable("DoDVNF_vnfInUse", true)
+                                               }
+                                       }                       
                                }
                        }else{
                                execution.setVariable("GENGV_FoundIndicator", false)