Fix closing of meta file if meta encoding failed

This commit is contained in:
Julius Volz 2017-04-28 15:45:30 +02:00
parent a5322c50fc
commit 94f1ac599e

View file

@ -138,8 +138,10 @@ func writeMetaFile(dir string, meta *BlockMeta) error {
enc := json.NewEncoder(f)
enc.SetIndent("", "\t")
if err := enc.Encode(&blockMeta{Version: 1, BlockMeta: meta}); err != nil {
return err
var merr MultiError
if merr.Add(enc.Encode(&blockMeta{Version: 1, BlockMeta: meta})); merr.Err() != nil {
merr.Add(f.Close())
return merr
}
if err := f.Close(); err != nil {
return err