From a10a64856d0ce30c8cdc25a8e9fd0d2eb64739da Mon Sep 17 00:00:00 2001
From: Nan Deng <dengnan@google.com>
Date: Fri, 20 Jun 2014 04:21:57 +0000
Subject: [PATCH] use json.Marshal directly

---
 pkg/kubelet/kubelet_server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kubelet/kubelet_server.go b/pkg/kubelet/kubelet_server.go
index afbb56ea535..1eeafb2c975 100644
--- a/pkg/kubelet/kubelet_server.go
+++ b/pkg/kubelet/kubelet_server.go
@@ -84,8 +84,7 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			fmt.Fprint(w, "{}")
 			return
 		}
-		encoder := json.NewEncoder(w)
-		err = encoder.Encode(stats)
+		data, err := json.Marshal(stats)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			fmt.Fprintf(w, "Internal Error: %#v", err)
@@ -93,6 +92,7 @@ func (s *KubeletServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		}
 		w.WriteHeader(http.StatusOK)
 		w.Header().Add("Content-type", "application/json")
+		w.Write(data)
 	case u.Path == "/containerInfo":
 		container := u.Query().Get("container")
 		if len(container) == 0 {