Merge pull request #7153 from xiang90/apiserver

minor cleanup for apiserver/errors.go
2015-06-02 10:37:36 -07:00
parent b7ae48eb1e fb3c8f9452
commit 55529d9256
2 changed files with 16 additions and 18 deletions
--- a/pkg/apiserver/errors.go
+++ b/pkg/apiserver/errors.go
@@ -36,17 +36,13 @@ func errToAPIStatus(err error) *api.Status {
 	case statusError:
 		status := t.Status()
 		if len(status.Status) == 0 {
-		}
-		switch status.Status {
-		case api.StatusSuccess:
-			if status.Code == 0 {
-				status.Code = http.StatusOK
-			}
-		case "":
 			status.Status = api.StatusFailure
-			fallthrough
-		case api.StatusFailure:
-			if status.Code == 0 {
+		}
+		if status.Code == 0 {
+			switch status.Status {
+			case api.StatusSuccess:
+				status.Code = http.StatusOK
+			case api.StatusFailure:
 				status.Code = http.StatusInternalServerError
 			}
 		}