Merge 4c9807a into 44be013

caicloud · Sep 18, 2017 · 6ce9150 · 6ce9150
2 parents 44be013 + 4c9807a
commit 6ce9150
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/api/rest/log.go b/api/rest/log.go
@@ -45,6 +45,8 @@ func getVersionLog(request *restful.Request, response *restful.Response) {
 		message := fmt.Sprintf("Unable to find version log by versionID %v", versionID)
 		log.ErrorWithFields(message, log.Fields{"user_id": userID, "error": err})
 		getResponse.ErrorMessage = message
+		response.WriteHeaderAndEntity(http.StatusNotFound, getResponse)
+		return
 	} else {
 		getResponse.Logs = result.Logs
 	}

diff --git a/api/rest/version.go b/api/rest/version.go
@@ -184,6 +184,8 @@ func getVersion(request *restful.Request, response *restful.Response) {
 		message := fmt.Sprintf("Unable to find version %v", versionID)
 		log.ErrorWithFields(message, log.Fields{"user_id": userID, "error": err})
 		getResponse.ErrorMessage = message
+		response.WriteHeaderAndEntity(http.StatusNotFound, getResponse)
+		return
 	} else {
 		getResponse.Version = *result
 	}
@@ -214,6 +216,8 @@ func listVersions(request *restful.Request, response *restful.Response) {
 		message := "Unable to list version"
 		log.ErrorWithFields(message, log.Fields{"user_id": userID, "error": err})
 		listResponse.ErrorMessage = message
+		response.WriteHeaderAndEntity(http.StatusNotFound, listResponse)
+		return
 	} else {
 		listResponse.Versions = result
 	}