Permalink
Browse files

Merge pull request #4 from temoto/patch-1

Attempt to close the file in SaveFile/LoadFile, and return either the serialization error, or the Close() error.
  • Loading branch information...
2 parents 72916cf + a768a84 commit e30c8eff7aa48426d4e25ce3c3055be10a47fa02 @patrickmn committed Oct 8, 2012
Showing with 12 additions and 2 deletions.
  1. +12 −2 cache.go
View
@@ -292,7 +292,12 @@ func (c *cache) SaveFile(fname string) error {
if err != nil {
return err
}
- return c.Save(fp)
+ err = c.Save(fp)
+ if err != nil {
+ fp.Close()
+ return err
+ }
+ return fp.Close()
}
// Add (Gob-serialized) cache items from an io.Reader, excluding any items with
@@ -319,7 +324,12 @@ func (c *cache) LoadFile(fname string) error {
if err != nil {
return err
}
- return c.Load(fp)
+ err = c.Load(fp)
+ if err != nil {
+ fp.Close()
+ return err
+ }
+ return fp.Close()
}
// Delete all items from the cache.

0 comments on commit e30c8ef

Please sign in to comment.