Merge changes I4e542ffd,Ibb86da2d

* changes:
  Fix Null Point Exception
  Fix Delete workflow sent msg to vfc adatper failed

1 files changed, 3 insertions, 0 deletions

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index 0bdead4835..0b404d76bd 100644
--- a/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/openecomp/mso/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -313,6 +313,9 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
             String resourceTemplateUUIDs) throws MsoRequestsDbException{
         String[] resourceLst = resourceTemplateUUIDs.split(":");
         for(String resource: resourceLst){
+            if("".equals(resource)){
+                continue;
+            }
             ResourceOperationStatus resourceStatus = new ResourceOperationStatus();
             resourceStatus.setOperationId(operationId);
             resourceStatus.setServiceId(serviceId);