HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failure caused by nil bean

This commit is contained in:
shanyy 2018-04-16 15:59:01 +08:00 committed by Lunny Xiao
parent 7fc1fe6524
commit 2eccd7cc30
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
session_find.go
View File

@ -398,12 +398,19 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
bean := cacher.GetBean(tableName, sid) bean := cacher.GetBean(tableName, sid)
// fix issue #894 // fix issue #894
ckb := reflect.ValueOf(bean).Elem().Type() isHit := func() (ht bool) {
ht := ckb == t if bean == nil {
if !ht && t.Kind() == reflect.Ptr { ht = false
ht = t.Elem() == ckb return
}
ckb := reflect.ValueOf(bean).Elem().Type()
ht = ckb == t
if !ht && t.Kind() == reflect.Ptr {
ht = t.Elem() == ckb
}
return
} }
if bean == nil || !ht { if !isHit() {
ides = append(ides, id) ides = append(ides, id)
ididxes[sid] = idx ididxes[sid] = idx
} else { } else {