Skip to content

K
k3s
Commit 30c1263b authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #20376 from smarterclayton/rest_error

Auto commit by PR queue bot
parents c2ac1bcd 6e0ad75a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/apiserver/watch.go
View file @ 30c1263b
...@@ -68,7 +68,7 @@ func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) { ...@@ -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) { func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) {
s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer) s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
// TODO: replace with typed serialization // TODO: replace with typed serialization
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment