diff options
author | Steve Smokowski <ss835w@att.com> | 2019-02-20 16:48:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-20 16:48:32 +0000 |
commit | 860edae04456562fd7cf249968cd54b30b1f7f12 (patch) | |
tree | 6eed96e0f3a836eedda3bed015e93942a0e1e0c4 /bpmn/so-bpmn-tasks/src/main/java/org/onap | |
parent | 7c843d5caf2e85b0b62325a782d614757767cf2f (diff) | |
parent | 33e33dc04125cd320a870b567a51c48525ccad0f (diff) |
Merge "Fixed possible NPE in WorkflowAction"
Diffstat (limited to 'bpmn/so-bpmn-tasks/src/main/java/org/onap')
-rw-r--r-- | bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 99bda80e4f..8a3a778b06 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -1050,9 +1050,11 @@ public class WorkflowAction { executeBuildingBlock.setRequestDetails(requestDetails); if(isConfiguration){ ConfigurationResourceKeys configurationResourceKeys = new ConfigurationResourceKeys(); - configurationResourceKeys.setCvnfcCustomizationUUID(resource.getCvnfModuleCustomizationId()); - configurationResourceKeys.setVfModuleCustomizationUUID(resource.getVfModuleCustomizationId()); - configurationResourceKeys.setVnfResourceCustomizationUUID(resource.getVnfCustomizationId()); + if (resource != null){ + configurationResourceKeys.setCvnfcCustomizationUUID(resource.getCvnfModuleCustomizationId()); + configurationResourceKeys.setVfModuleCustomizationUUID(resource.getVfModuleCustomizationId()); + configurationResourceKeys.setVnfResourceCustomizationUUID(resource.getVnfCustomizationId()); + } executeBuildingBlock.setConfigurationResourceKeys(configurationResourceKeys); } return executeBuildingBlock; |