Merge pull request #987 from mavenugo/cnr

aboch · aboch · commit 5081ee1ad86d · 2016-03-03T08:57:55.000-08:00
Fixed a panic issue in clearNetworkResources
diff --git a/sandbox.go b/sandbox.go
@@ -650,7 +650,7 @@ func (sb *sandbox) clearNetworkResources(origEp *endpoint) error {
 	ep := sb.getEndpoint(origEp.id)
 	if ep == nil {
 		return fmt.Errorf("could not find the sandbox endpoint data for endpoint %s",
-			ep.name)
+			origEp.id)
 	}
 
 	sb.Lock()

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ func (sb sandbox) clearNetworkResources(origEp endpoint) error {`
`650`	`650`	`ep := sb.getEndpoint(origEp.id)`
`651`	`651`	`if ep == nil {`
`652`	`652`	`return fmt.Errorf("could not find the sandbox endpoint data for endpoint %s",`
`653`		`- ep.name)`
	`653`	`+ origEp.id)`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`sb.Lock()`