From ce4c793b6f1d72ecf18060d1485f2a3e4d5d8bc0 Mon Sep 17 00:00:00 2001
From: zhengjiajin <393926893@qq.com>
Date: Thu, 25 May 2017 15:13:45 +0800
Subject: [PATCH] fix err message and small change in UX

---
 .../src/k8s.io/apimachinery/pkg/runtime/codec_check.go    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/codec_check.go b/staging/src/k8s.io/apimachinery/pkg/runtime/codec_check.go
index 1d34ec1a85..510444a4de 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/codec_check.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/codec_check.go
@@ -28,8 +28,7 @@ import (
 // object. (Will modify internalObject.) (Assumes JSON serialization.)
 // TODO: verify that the correct external version is chosen on encode...
 func CheckCodec(c Codec, internalType Object, externalTypes ...schema.GroupVersionKind) error {
-	_, err := Encode(c, internalType)
-	if err != nil {
+	if _, err := Encode(c, internalType); err != nil {
 		return fmt.Errorf("Internal type not encodable: %v", err)
 	}
 	for _, et := range externalTypes {
@@ -41,9 +40,8 @@ func CheckCodec(c Codec, internalType Object, externalTypes ...schema.GroupVersi
 		if reflect.TypeOf(obj) != reflect.TypeOf(internalType) {
 			return fmt.Errorf("decode of external type %s produced: %#v", et, obj)
 		}
-		err = DecodeInto(c, exBytes, internalType)
-		if err != nil {
-			return fmt.Errorf("external type %s not convertable to internal type: %v", et, err)
+		if err = DecodeInto(c, exBytes, internalType); err != nil {
+			return fmt.Errorf("external type %s not convertible to internal type: %v", et, err)
 		}
 	}
 	return nil