lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 04:01:29 +00:00
Code Issues Releases Activity

Merge pull request #1227 from oiooj/develop

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
router.go
View File

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