github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #985 from samuelkarp/task-delete-nil-check

Browse Source 
containerd: nil-check before calling io.Close
This commit is contained in:
Michael Crosby 2017-06-09 11:31:04 -07:00 committed by GitHub
commit beaff3d81d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
task.go
View File

@ -156,7 +156,10 @@ func (t *task) Wait(ctx context.Context) (uint32, error) {
// it returns the exit status of the task and any errors that were encountered // it returns the exit status of the task and any errors that were encountered
// during cleanup // during cleanup
func (t *task) Delete(ctx context.Context) (uint32, error) { func (t *task) Delete(ctx context.Context) (uint32, error) {
cerr := t.io.Close() var cerr error
if t.io != nil {
cerr = t.io.Close()
}
r, err := t.client.TaskService().Delete(ctx, &execution.DeleteRequest{ r, err := t.client.TaskService().Delete(ctx, &execution.DeleteRequest{
ContainerID: t.containerID, ContainerID: t.containerID,
}) })