Merge remote-tracking branch 'refs/remotes/origin/dev'

This commit is contained in:
Makis Maropoulos 2016-07-07 13:05:31 +02:00
commit aefaff1297
2 changed files with 1 additions and 3 deletions

View File

@ -35,7 +35,6 @@ func (s *Store) Get(key string) interface{} {
if value, found := s.values[key]; found { if value, found := s.values[key]; found {
return value return value
} }
s.mu.Unlock()
return nil return nil
} }
@ -109,7 +108,7 @@ func (s *Store) SetLastAccessedTime(lastacc time.Time) {
s.lastAccessedTime = lastacc s.lastAccessedTime = lastacc
} }
// Destroy // Destroy deletes all keys
func (s *Store) Destroy() { func (s *Store) Destroy() {
// clears without provider's update. // clears without provider's update.
s.mu.Lock() s.mu.Lock()

View File

@ -95,7 +95,6 @@ func (s *Store) VisitAll(cb func(k string, v interface{})) {
func (s *Store) Get(key string) interface{} { func (s *Store) Get(key string) interface{} {
Provider.Update(s.sid) Provider.Update(s.sid)
if value, found := s.values[key]; found { if value, found := s.values[key]; found {
s.mu.Unlock()
return value return value
} }
return nil return nil