Merge pull request #1227 from oiooj/develop

fix FilterHandler crash issue
This commit is contained in:
astaxie 2015-06-19 11:43:15 +08:00
commit a89f14d80d
1 changed files with 6 additions and 1 deletions

View File

@ -616,6 +616,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
}
if ok, params := filterR.ValidRouter(urlPath); ok {
for k, v := range params {
if context.Input.Params == nil {
context.Input.Params = make(map[string]string)
}
context.Input.Params[k] = v
}
filterR.filterFunc(context)
@ -699,7 +702,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
p[strconv.Itoa(k)] = v
}
}
context.Input.Params = p
if p != nil {
context.Input.Params = p
}
}
}