etcdserver: simplify non/streaming handling

etcdserver/etcdhttp/http.go

@@ -353,22 +353,6 @@ func handleWatch(w http.ResponseWriter, wa store.Watcher, stream bool) {
 
 	cw := httputil.NewChunkedWriter(w)
 
-	if !stream {
-		select {
-		case <-nch:
-			// Client closed connection. Nothing to do.
-		case <-tch:
-			cw.Close()
-		case ev := <-ech:
-			if err := json.NewEncoder(cw).Encode(ev); err != nil {
-				// Should never be reached
-				log.Println("error writing event: %v", err)
-			}
-		}
-		return
-	}
-
-	// streaming loop
 	for {
 		select {
 		case <-nch:
@@ -389,6 +373,9 @@ func handleWatch(w http.ResponseWriter, wa store.Watcher, stream bool) {
 				log.Println("error writing event: %v", err)
 				return
 			}
+			if !stream {
+				return
+			}
 			w.(http.Flusher).Flush()
 		}
 	}