X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mso-api-handlers%2Fmso-api-handler-infra%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fapihandlerinfra%2FOrchestrationRequests.java;h=b65b82a87d773a12c0fd20f5155592fecdc1fd28;hb=afbb910b668f5ce343482ad855a96c3ffa7361c8;hp=c809079acfff28c11308fbf3fa6f2ea1f3b1454a;hpb=5d015004a0348d332798665c57dcf5a37220a107;p=so.git

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
index c809079acf..b65b82a87d 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java
@@ -333,6 +333,10 @@ public class OrchestrationRequests {
 	       String startTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getStartTime()) + " GMT";
 	       request.setStartTime(startTimeStamp);
        }
+       if(iar.getEndTime() != null){
+    	   String endTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getEndTime()) + " GMT";
+    	   request.setFinishTime(endTimeStamp);
+       }
        String statusMessages = null;
        RequestStatus status = new RequestStatus();
        if(iar.getStatusMessage() != null){
@@ -340,28 +344,31 @@ public class OrchestrationRequests {
        }
        if(flowStatusMessage != null){
     	   if(statusMessages != null){
-    		   statusMessages = statusMessages + "/";
+    		   statusMessages = statusMessages + " " + "FLOW STATUS: " + flowStatusMessage;
+    	   }else{
+    		   statusMessages = "FLOW STATUS: " + flowStatusMessage;
     	   }
-    	   statusMessages = statusMessages + "FLOW STATUS: " + flowStatusMessage;
        }
        if(retryStatusMessage != null){
     	   if(statusMessages != null){
-    		   statusMessages = statusMessages + "/";
+    		   statusMessages = statusMessages + " " + "RETRY STATUS: " + retryStatusMessage;
+    	   }else{
+    		   statusMessages = "RETRY STATUS: " + retryStatusMessage;
     	   }
-    	   statusMessages = statusMessages + "RETRY STATUS: " + retryStatusMessage;
        }
        if(rollbackStatusMessage != null){
     	   if(statusMessages != null){
-    		   statusMessages = statusMessages + "/";
+    		   statusMessages = statusMessages + " " + "ROLLBACK STATUS: " + rollbackStatusMessage;
+    	   }else{
+    		   statusMessages = "ROLLBACK STATUS: " + rollbackStatusMessage;
     	   }
-    	   statusMessages = statusMessages + "ROLLBACK STATUS: " + rollbackStatusMessage;
        }
        if(statusMessages != null){
     	   status.setStatusMessage(statusMessages);
        }
-       if(iar.getEndTime() != null){
-    	   String endTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getEndTime()) + " GMT";
-    	   status.setFinishTime(endTimeStamp);
+       if(iar.getModifyTime() != null){
+    	   String timeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getModifyTime()) + " GMT";
+    	   status.setTimeStamp(timeStamp);
        }