Sfoglia il codice sorgente

libnetwork/internal/kvstore/boltdb: BoltDB.Get(): don't shadow error

Don't shadow the original error if we got one.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 anni fa
parent
commit
95b96eebdd
1 ha cambiato i file con 3 aggiunte e 4 eliminazioni
  1. 3 4
      libnetwork/internal/kvstore/boltdb/boltdb.go

+ 3 - 4
libnetwork/internal/kvstore/boltdb/boltdb.go

@@ -139,13 +139,12 @@ func (b *BoltDB) Get(key string) (*store.KVPair, error) {
 
 
 		return nil
 		return nil
 	})
 	})
-
-	if len(val) == 0 {
-		return nil, store.ErrKeyNotFound
-	}
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
+	if len(val) == 0 {
+		return nil, store.ErrKeyNotFound
+	}
 
 
 	dbIndex := binary.LittleEndian.Uint64(val[:libkvmetadatalen])
 	dbIndex := binary.LittleEndian.Uint64(val[:libkvmetadatalen])
 	val = val[libkvmetadatalen:]
 	val = val[libkvmetadatalen:]