From: Arthur Martella <am153x@att.com>
Date: Wed, 16 May 2018 15:41:48 +0000 (-0400)
Subject: Only set recipe when null in getServiceURI
X-Git-Tag: v1.2.1~54
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=04e02fd411de15ae23753c2cf71703c0bc9d06e3;p=so.git

Only set recipe when null in getServiceURI

Change-Id: I526d79d602d27c7c734bd1e38a4733176bd55f15
Issue-ID: SO-619
Signed-off-by: Arthur Martella <am153x@att.com>
---

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
index 9cba623642..e16963db3b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
@@ -984,15 +984,15 @@ public class ServiceInstances {
 		RequestParameters reqParam = msoRequest.getServiceInstancesRequest().getRequestDetails().getRequestParameters();
 		if(reqParam!=null && reqParam.isaLaCarte()!=null && reqParam.isaLaCarte() && recipe==null){
 			return null;
+		} else if (recipe==null) {
+			//aLaCarte wasn't sent, so we'll try the default
+			serviceRecord = db.getServiceByModelName(defaultSourceServiceModelName);
+			if (serviceRecord == null) {
+				serviceRecord = db.getServiceByModelName(defaultServiceModelName);
+			}
+			recipe = db.getServiceRecipeByModelUUID(serviceRecord.getModelUUID(), action.name());
 		}
 
-		//aLaCarte wasn't sent, so we'll try the default
-		serviceRecord = db.getServiceByModelName(defaultSourceServiceModelName);
-		if (serviceRecord == null) {
-			serviceRecord = db.getServiceByModelName(defaultServiceModelName);
-		}
-
-		recipe = db.getServiceRecipeByModelUUID(serviceRecord.getModelUUID(), action.name());
 		if(modelInfo.getModelVersionId() == null) {
 			modelInfo.setModelVersionId(serviceRecord.getModelUUID());
 		}