1710 Rebase - Second Attempt

[so.git] / bpmn / MSOCommonBPMN / src / main / groovy / org / openecomp / mso / bpmn / common / scripts / MsoUtils.groovy

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
index 26c3049..41b86c9 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/MsoUtils.groovy
@@ -858,6 +858,8 @@ class MsoUtils {
         * @return base 64 encoded basic auth credentials\r
         */\r
        def getBasicAuth(encryptedAuth, msoKey){\r
+               if ((encryptedAuth == null || encryptedAuth.isEmpty()) || (msoKey == null || msoKey.isEmpty()))\r
+                       return null\r
                try {\r
                        def auth = decrypt(encryptedAuth, msoKey)\r
                        byte[] encoded = Base64.encodeBase64(auth.getBytes())\r