From d419eedb063ac3bcddd67b3adceaab8b60e93e8a Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sat, 9 Aug 2014 10:46:56 -0400
Subject: [PATCH] Watch handler not returning after 404

---
 pkg/apiserver/watch.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
index b2315b78563..9a2ee1fd263 100644
--- 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())