Deferred defer

Signed-off-by: Vishal Rana <vr@labstack.com>

Author: vishr

echo.go

@@ -198,7 +198,6 @@ func (e *Echo) Index(file string) {
 
 func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h, c, echo := e.Router.Find(r.Method, r.URL.Path)
-	defer e.pool.Put(c)
 	if echo != nil {
 		e = echo
 	}
@@ -212,6 +211,7 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	// Handler
 	h(c)
+	e.pool.Put(c)
 }
 
 // Run a server

router.go

@@ -216,11 +216,11 @@ func (r *router) Find(method, path string) (h HandlerFunc, c *Context, echo *Ech
 
 func (r *router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	h, c, _ := r.Find(req.Method, req.URL.Path)
-	defer r.echo.pool.Put(c)
 	c.Response.ResponseWriter = w
 	if h != nil {
 		h(c)
 	} else {
 		r.echo.notFoundHandler(c)
 	}
+	r.echo.pool.Put(c)
 }