Merge pull request kubernetes#840 from smarterclayton/missing_return_…

…in_watch Watch handler not returning after 404
duda · Aug 9, 2014 · e35dfed · e35dfed
2 parents c718661 + d419eed
commit e35dfed
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
@@ -55,10 +55,12 @@ func (h *WatchHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	parts := splitPath(req.URL.Path)
 	if len(parts) < 1 || req.Method != "GET" {
 		notFound(w, req)
+		return
 	}
 	storage := h.storage[parts[0]]
 	if storage == nil {
 		notFound(w, req)
+		return
 	}
 	if watcher, ok := storage.(ResourceWatcher); ok {
 		label, field, resourceVersion := getWatchParams(req.URL.Query())