commit 45ad064150940a7e54316620d9716443bdaaf0ab
author Alexander Morozov <lk4d4@docker.com> Tue Mar 31 15:12:15 2015 -0700
committer Jessica Frazelle <jess@docker.com> Tue Mar 31 16:43:16 2015 -0700
tree 0ec051da8954d7a080412c3e8c56b316c50d2095
parent 72e14a156691bcc2c3a2c01d16175eb9bfd1cef2

Fix panic in integration tests

Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit c71747571458bf992c729c483c9509e8182d630b)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

api/server/server_linux.go

diff --git a/api/server/server_linux.go b/api/server/server_linux.go
index fff803d..a931157 100644
--- a/api/server/server_linux.go
+++ b/api/server/server_linux.go
@@ -95,7 +95,9 @@
 	go systemd.SdNotify("READY=1")
 
 	// close the lock so the listeners start accepting connections
-	if activationLock != nil {
+	select {
+	case <-activationLock:
+	default:
 		close(activationLock)
 	}