Browse Source

Return empty map when there are no values

Pieter Joost van de Sande 13 years ago
committed by Adam Mckaig
parent
commit
3e810b0ccc
2 changed files with 7 additions and 9 deletions
  1. +4
    -5
      context.go
  2. +3
    -4
      context_test.go

+ 4
- 5
context.go View File

@ -49,13 +49,12 @@ func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
}
// GetAll returns all stored values for the request as a map.
func GetAll(r *http.Request) (map[interface{}]interface{}, bool) {
func GetAll(r *http.Request) map[interface{}]interface{} {
mutex.Lock()
defer mutex.Unlock()
if all, ok := data[r]; ok {
return all, ok
}
return nil, false
context, _ := data[r]
return context
}
// Delete removes a value stored for a given key in a given request.


+ 3
- 4
context_test.go View File

@ -53,13 +53,12 @@ func TestContext(t *testing.T) {
assertEqual(ok, true)
// GetAll()
values, ok := GetAll(r)
assertEqual(ok, true)
values := GetAll(r)
assertEqual(len(values), 3)
// GetAll() for empty request
values, ok = GetAll(emptyR)
assertEqual(ok, false)
values = GetAll(emptyR)
assertEqual(len(values), 0)
// Delete()
Delete(r, key1)


Loading…
Cancel
Save