Browse code

Return err if we got err on parseForm

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>

Qiang Huang authored on 2015/05/27 19:16:28
Showing 1 changed files
... ...
@@ -863,7 +863,7 @@ func (s *Server) postImagesLoad(version version.Version, w http.ResponseWriter,
863 863
 
864 864
 func (s *Server) postContainersCreate(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
865 865
 	if err := parseForm(r); err != nil {
866
-		return nil
866
+		return err
867 867
 	}
868 868
 	if err := checkForJson(r); err != nil {
869 869
 		return err
... ...
@@ -1288,7 +1288,7 @@ func (s *Server) postContainersCopy(version version.Version, w http.ResponseWrit
1288 1288
 
1289 1289
 func (s *Server) postContainerExecCreate(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
1290 1290
 	if err := parseForm(r); err != nil {
1291
-		return nil
1291
+		return err
1292 1292
 	}
1293 1293
 	name := vars["name"]
1294 1294
 
... ...
@@ -1317,7 +1317,7 @@ func (s *Server) postContainerExecCreate(version version.Version, w http.Respons
1317 1317
 // TODO(vishh): Refactor the code to avoid having to specify stream config as part of both create and start.
1318 1318
 func (s *Server) postContainerExecStart(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
1319 1319
 	if err := parseForm(r); err != nil {
1320
-		return nil
1320
+		return err
1321 1321
 	}
1322 1322
 	var (
1323 1323
 		execName = vars["name"]