Merge "Added null check to prevent call of getVnfResources() method for null vf object"

1 files changed, 4 insertions, 2 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index a141f59153..1d73bf21c9 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@ -843,8 +843,10 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
             // Add version check
             // First - see if it's in the VnfResource record
             // if we have a vf Module - then we have to query to get the VnfResource record.
-            if (!oldWay && vf.getVnfResources() != null) {
-                vnfResource = vf.getVnfResources();
+            if (!oldWay) {
+                if (vf != null) {
+                    vnfResource = vf.getVnfResources();
+                }
                 if (vnfResource == null) {
                     logger.debug("Unable to find vnfResource will not error for now...");
                 }