diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2020-11-11 10:16:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 10:16:39 +0800 |
| commit | a38efe2e7baf34cb074c9db095f7db50de0fa156 (patch) | |
| tree | a731f4e931f5ec6ec3087babfa1f4a2ff781b80c /weed/server/common.go | |
| parent | 546f1bcb903dd26ba447cdbedb972736fdb31b42 (diff) | |
| parent | de3bdd0651cb2b83319d78cbb0f9da86cd950bfb (diff) | |
| download | seaweedfs-a38efe2e7baf34cb074c9db095f7db50de0fa156.tar.xz seaweedfs-a38efe2e7baf34cb074c9db095f7db50de0fa156.zip | |
Merge pull request #35 from chrislusf/master
sync
Diffstat (limited to 'weed/server/common.go')
| -rw-r--r-- | weed/server/common.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 44098a4b5..62ddf6e7f 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -38,10 +38,12 @@ func init() { func writeJson(w http.ResponseWriter, r *http.Request, httpStatus int, obj interface{}) (err error) { var bytes []byte - if r.FormValue("pretty") != "" { - bytes, err = json.MarshalIndent(obj, "", " ") - } else { - bytes, err = json.Marshal(obj) + if obj != nil { + if r.FormValue("pretty") != "" { + bytes, err = json.MarshalIndent(obj, "", " ") + } else { + bytes, err = json.Marshal(obj) + } } if err != nil { return |