Ec2Client.java (eucalyptus-4.4.1) | : | Ec2Client.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 1224 | skipping to change at line 1224 | |||
instances); | instances); | |||
final CheckedListenableFuture<Boolean> result = task | final CheckedListenableFuture<Boolean> result = task | |||
.dispatch(new Ec2Context(userId)); | .dispatch(new Ec2Context(userId)); | |||
try { | try { | |||
if (result.get()) { | if (result.get()) { | |||
final List<RunningInstancesItemType> describe = task.getResult(); | final List<RunningInstancesItemType> describe = task.getResult(); | |||
return describe; | return describe; | |||
} else | } else | |||
throw new EucalyptusActivityException( | throw new EucalyptusActivityException( | |||
task.getErrorMessage() != null ? task.getErrorMessage() | task.getErrorMessage() != null ? task.getErrorMessage() | |||
: "failed to describe the instances"); | : "Failed to describe the instances"); | |||
} catch (Exception ex) { | } catch (Exception ex) { | |||
throw Exceptions.toUndeclared(ex); | throw Exceptions.toUndeclared(ex); | |||
} | } | |||
} | } | |||
public List<ClusterInfoType> describeAvailabilityZones(final String userId, | public List<ClusterInfoType> describeAvailabilityZones(final String userId, | |||
boolean verbose) throws EucalyptusActivityException { | boolean verbose) throws EucalyptusActivityException { | |||
final ComputeDescribeAvailabilityZonesTask task = new ComputeDescribeAvailab ilityZonesTask( | final ComputeDescribeAvailabilityZonesTask task = new ComputeDescribeAvailab ilityZonesTask( | |||
verbose); | verbose); | |||
final CheckedListenableFuture<Boolean> result = task | final CheckedListenableFuture<Boolean> result = task | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |