Merge pull request #20376 from smarterclayton/rest_error

Auto commit by PR queue bot

Merge pull request #20376 from smarterclayton/rest_error
30c1263b · k8s-merge-robot · c2ac1bcd · 6e0ad75a · 30c1263b · 30c1263b
Commit 30c1263b authored Feb 06, 2016 by k8s-merge-robot
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

resthandler.go pkg/apiserver/resthandler.go +0 -0

watch.go pkg/apiserver/watch.go +1 -1

No files found.
--- a/pkg/apiserver/resthandler.go
+++ b/pkg/apiserver/resthandler.go
--- a/pkg/apiserver/watch.go
+++ b/pkg/apiserver/watch.go
@@ -68,7 +68,7 @@ func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) {
 func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) {
 	s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer)
 	if err != nil {
-		scope.err(err, req, res)
+		scope.err(err, res.ResponseWriter, req.Request)
 		return
 	}
 	// TODO: replace with typed serialization