docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity

Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil

Browse Source 
Return err if we got err on parseForm
Upstream-commit: b29f3bb1c306e3fa52ec24e9011cafed89eef9c9
Component: engine
This commit is contained in:
Doug Davis
2015-05-27 12:38:53 -04:00
parent d177b20750 d3998344e0
commit 810a7285de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/api/server/server.go
View File

@@ -863,7 +863,7 @@ func (s *Server) postImagesLoad(version version.Version, w http.ResponseWriter,
func (s *Server) postContainersCreate(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := parseForm(r); err != nil {
return nil
return err
}
if err := checkForJson(r); err != nil {
return err
@@ -1288,7 +1288,7 @@ func (s *Server) postContainersCopy(version version.Version, w http.ResponseWrit
func (s *Server) postContainerExecCreate(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := parseForm(r); err != nil {
return nil
return err
}
name := vars["name"]
@@ -1317,7 +1317,7 @@ func (s *Server) postContainerExecCreate(version version.Version, w http.Respons
// TODO(vishh): Refactor the code to avoid having to specify stream config as part of both create and start.
func (s *Server) postContainerExecStart(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := parseForm(r); err != nil {
return nil
return err
}
var (
execName = vars["name"]