diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-31 09:45:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-31 09:45:26 -0400 |
commit | 3352e8b0e6bb77344a4470ef86b2d2dc6262a668 (patch) | |
tree | 3aa275c9a348f02ed2c6638fcea57e04c21b5aa1 /vendor/github.com/google/uuid/version1.go | |
parent | 24a335b0aeedfb04dea5b0d498b5984458f73779 (diff) | |
parent | cf147050d40296d15ec92cb97b55351cc236735e (diff) | |
download | podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.tar.gz podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.tar.bz2 podman-3352e8b0e6bb77344a4470ef86b2d2dc6262a668.zip |
Merge pull request #7507 from containers/dependabot/go_modules/github.com/google/uuid-1.1.2
Bump github.com/google/uuid from 1.1.1 to 1.1.2
Diffstat (limited to 'vendor/github.com/google/uuid/version1.go')
-rw-r--r-- | vendor/github.com/google/uuid/version1.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vendor/github.com/google/uuid/version1.go b/vendor/github.com/google/uuid/version1.go index 199a1ac65..463109629 100644 --- a/vendor/github.com/google/uuid/version1.go +++ b/vendor/github.com/google/uuid/version1.go @@ -17,12 +17,6 @@ import ( // // In most cases, New should be used. func NewUUID() (UUID, error) { - nodeMu.Lock() - if nodeID == zeroID { - setNodeInterface("") - } - nodeMu.Unlock() - var uuid UUID now, seq, err := GetTime() if err != nil { @@ -38,7 +32,13 @@ func NewUUID() (UUID, error) { binary.BigEndian.PutUint16(uuid[4:], timeMid) binary.BigEndian.PutUint16(uuid[6:], timeHi) binary.BigEndian.PutUint16(uuid[8:], seq) + + nodeMu.Lock() + if nodeID == zeroID { + setNodeInterface("") + } copy(uuid[10:], nodeID[:]) + nodeMu.Unlock() return uuid, nil } |