docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix panic when instance doesn't exist remotely 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-03-03 14:48:04 -08:00
parent a7d1a70442
commit 8d0bf21c6d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/amazonec2/amazonec2.go
View File

@ -402,6 +402,8 @@ func (d *Driver) GetState() (state.State, error) {
return state.Stopping, nil return state.Stopping, nil
case "stopped": case "stopped":
return state.Stopped, nil return state.Stopped, nil
default:
return state.Error, nil
} }
return state.None, nil return state.None, nil
} }

6
drivers/amazonec2/amz/ec2.go
View File

@ -501,9 +501,11 @@ func (e *EC2) GetInstance(instanceId string) (EC2Instance, error) {
return ec2Instance, fmt.Errorf("Error unmarshalling AWS response XML: %s", err) return ec2Instance, fmt.Errorf("Error unmarshalling AWS response XML: %s", err)
} }
if len(unmarshalledResponse.ReservationSet) > 0 {
reservationSet := unmarshalledResponse.ReservationSet[0] reservationSet := unmarshalledResponse.ReservationSet[0]
instance := reservationSet.InstancesSet[0] ec2Instance = reservationSet.InstancesSet[0]
return instance, nil }
return ec2Instance, nil
} }
func (e *EC2) StartInstance(instanceId string) error { func (e *EC2) StartInstance(instanceId string) error {