浏览代码

Merge pull request #323 from mavenugo/master

leave must not use join options in the defer during failures
Jana Radhakrishnan 10 年之前
父节点
当前提交
1da7a34862
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      libnetwork/endpoint.go

+ 1 - 1
libnetwork/endpoint.go

@@ -350,7 +350,7 @@ func (ep *endpoint) Join(containerID string, options ...EndpointOption) error {
 	defer func() {
 	defer func() {
 		ep.joinLeaveEnd()
 		ep.joinLeaveEnd()
 		if err != nil {
 		if err != nil {
-			if e := ep.Leave(containerID, options...); e != nil {
+			if e := ep.Leave(containerID); e != nil {
 				log.Warnf("couldnt leave endpoint : %v", ep.name, err)
 				log.Warnf("couldnt leave endpoint : %v", ep.name, err)
 			}
 			}
 		}
 		}