X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FCreateDcaeMicroServiceController.java;h=e7ed57add1046724078967c9f60a0ad0adfacf2e;hb=b812d8673c0fc3c524165de933bcaf621f84a7c5;hp=0f315a392dc7170689bd8695903a188023ef05a7;hpb=95a5bc9816c0bdf56b4ea6699004eb29940ddc6a;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index 0f315a392..e7ed57add 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -582,7 +582,11 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 		
 		//Get element order info 
 		String dataOrderInfo = returnModel.getDataOrderInfo();
-		
+        if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+            dataOrderInfo = "\"" + dataOrderInfo + "\"";
+        }
+        LOGGER.info("dataOrderInfo : " + dataOrderInfo);
+        
 		String allManyTrueKeys = "";
 		if(allkeys != null){
 			allManyTrueKeys = allkeys.toString();
@@ -1177,7 +1181,17 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
 			fileList = listModelFiles(this.directory);
 		}else if (yml==true){
 			
-			msMLUtils.parseTosca(this.newFile);
+			errorMsg = msMLUtils.parseTosca(this.newFile);
+			if(errorMsg != null){
+				PrintWriter out = response.getWriter();				
+				response.setCharacterEncoding("UTF-8");
+				response.setContentType("application / json");
+				request.setCharacterEncoding("UTF-8");
+				JSONObject j = new JSONObject();
+				j.put("errorMsg", errorMsg);
+			    out.write(j.toString());
+			    return;
+			}
 			
 		}else {
 			File file = new File(this.newFile);