Merge pull request #1512 from mrjana/bugs

Fix map access race in populatedEndpoints
moby · Oct 18, 2016 · 6740616 · 6740616
2 parents fad68bd + c254f3f
commit 6740616
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sandbox.go b/sandbox.go
@@ -848,8 +848,9 @@ func (sb *sandbox) clearNetworkResources(origEp *endpoint) error {
 		releaseOSSboxResources(osSbox, ep)
 	}
 
-	delete(sb.populatedEndpoints, ep.ID())
 	sb.Lock()
+	delete(sb.populatedEndpoints, ep.ID())
+
 	if len(sb.endpoints) == 0 {
 		// sb.endpoints should never be empty and this is unexpected error condition
 		// We log an error message to note this down for debugging purposes.