Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Fix issue #894 #895

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix issue #894 #895

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e1c0ee
Fix issue #894
sleagon Apr 16, 2018
e4f17e6
Judge both type of struct and pointer in case of out-of-range
sleagon Apr 16, 2018
c0b7dd7
Fix failure caused by nil bean
sleagon Apr 16, 2018
92412c5
Merge branch 'master' into master
lunny Apr 29, 2018
87b2847
Merge branch 'master' into master
lunny Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion session_find.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,21 @@ func (session *Session) cacheFind(t reflect.Type, sqlStr string, rowsSlicePtr in
return err
}
bean := cacher.GetBean(tableName, sid)
if bean == nil || reflect.ValueOf(bean).Elem().Type() != t {

// fix issue #894
isHit := func() (ht bool) {
if bean == nil {
ht = false
return
}
ckb := reflect.ValueOf(bean).Elem().Type()
ht = ckb == t
if !ht && t.Kind() == reflect.Ptr {
ht = t.Elem() == ckb
}
return
}
if !isHit() {
ides = append(ides, id)
ididxes[sid] = idx
} else {
Expand Down