1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #440 from aboch/dfe

Fix bug "...has already joined the endpoint"
This commit is contained in:
Madhu Venugopal 2015-08-05 17:42:58 -07:00
commit 429a4624e9

View file

@ -410,7 +410,8 @@ func (ep *endpoint) Join(containerID string, options ...EndpointOption) error {
}
defer func() {
if err != nil {
if err = driver.Leave(nid, epid); err != nil {
// Do not alter global err variable, it's needed by the previous defer
if err := driver.Leave(nid, epid); err != nil {
log.Warnf("driver leave failed while rolling back join: %v", err)
}
}