Fix possible race condition

Closes go-macaron#110
qintongbaba · Dec 22, 2016 · ddb19a9 · ddb19a9
1 parent ea92506
commit ddb19a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/macaron.go b/macaron.go
@@ -32,7 +32,7 @@ import (
 	"github.com/go-macaron/inject"
 )
 
-const _VERSION = "1.1.10.1222"
+const _VERSION = "1.1.11.1222"
 
 func Version() string {
 	return _VERSION

diff --git a/router.go b/router.go
@@ -258,7 +258,9 @@ func (r *Router) NotFound(handlers ...Handler) {
 	validateHandlers(handlers)
 	r.notFound = func(rw http.ResponseWriter, req *http.Request) {
 		c := r.m.createContext(rw, req)
-		c.handlers = append(r.m.handlers, handlers...)
+		c.handlers = make([]Handler, 0, len(r.m.handlers)+len(handlers))
+		c.handlers = append(c.handlers, r.m.handlers...)
+		c.handlers = append(c.handlers, handlers...)
 		c.run()
 	}
 }