@@ -33,13 +33,13 @@ func (daemon *Daemon) ContainerRename(oldName, newName string) error {

 	oldName = container.Name

 	oldIsAnonymousEndpoint := container.NetworkSettings.IsAnonymousEndpoint

-	container.Lock()

-	defer container.Unlock()

-

 	if oldName == newName {

 		return fmt.Errorf("Renaming a container with the same name as its current name")

 	}

+	container.Lock()

+	defer container.Unlock()

+

 	if newName, err = daemon.reserveName(container.ID, newName); err != nil {

 		return fmt.Errorf("Error when allocating new name: %v", err)

 	}