Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 130: fixed npe when there is no ip address 

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2465 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
adrian.f.cole 2009-12-18 08:36:16 +00:00
parent dfc519c79c
commit 6bd1663f3d
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aws/core/src/main/java/org/jclouds/aws/ec2/compute/EC2ComputeService.java
View File

@ -73,11 +73,14 @@ public class EC2ComputeService implements ComputeService {
protected Logger logger = Logger.NULL; protected Logger logger = Logger.NULL;
private final EC2Client ec2Client; private final EC2Client ec2Client;
private final Predicate<RunningInstance> instanceStateRunning; private final Predicate<RunningInstance> instanceStateRunning;
private final RunningInstanceToServerMetadata runningInstanceToServerMetadata;
@Inject @Inject
public EC2ComputeService(EC2Client tmClient, Predicate<RunningInstance> instanceStateRunning) { public EC2ComputeService(EC2Client tmClient, Predicate<RunningInstance> instanceStateRunning,
RunningInstanceToServerMetadata runningInstanceToServerMetadata) {
this.ec2Client = tmClient; this.ec2Client = tmClient;
this.instanceStateRunning = instanceStateRunning; this.instanceStateRunning = instanceStateRunning;
this.runningInstanceToServerMetadata = runningInstanceToServerMetadata;
} }
private Map<Image, String> imageAmiIdMap = ImmutableMap.<Image, String> builder().put( private Map<Image, String> imageAmiIdMap = ImmutableMap.<Image, String> builder().put(
@ -89,7 +92,7 @@ public class EC2ComputeService implements ComputeService {
private Map<Profile, InstanceType> profileInstanceTypeMap = ImmutableMap private Map<Profile, InstanceType> profileInstanceTypeMap = ImmutableMap
.<Profile, InstanceType> builder().put(Profile.SMALLEST, InstanceType.M1_SMALL).build(); .<Profile, InstanceType> builder().put(Profile.SMALLEST, InstanceType.M1_SMALL).build();
private Map<InstanceState, ServerState> instanceToServerState = ImmutableMap private static Map<InstanceState, ServerState> instanceToServerState = ImmutableMap
.<InstanceState, ServerState> builder().put(InstanceState.PENDING, ServerState.PENDING) .<InstanceState, ServerState> builder().put(InstanceState.PENDING, ServerState.PENDING)
.put(InstanceState.RUNNING, ServerState.RUNNING).put(InstanceState.SHUTTING_DOWN, .put(InstanceState.RUNNING, ServerState.RUNNING).put(InstanceState.SHUTTING_DOWN,
ServerState.PENDING).put(InstanceState.TERMINATED, ServerState.TERMINATED) ServerState.PENDING).put(InstanceState.TERMINATED, ServerState.TERMINATED)
@ -175,10 +178,27 @@ public class EC2ComputeService implements ComputeService {
@Override @Override
public ServerMetadata getServerMetadata(String id) { public ServerMetadata getServerMetadata(String id) {
RunningInstance runningInstance = getRunningInstance(id); RunningInstance runningInstance = getRunningInstance(id);
return new ServerMetadataImpl(runningInstance.getInstanceId(), runningInstance.getKeyName(), return runningInstanceToServerMetadata.apply(runningInstance);
instanceToServerState.get(runningInstance.getInstanceState()), ImmutableSet }
.<InetAddress> of(runningInstance.getIpAddress()), ImmutableSet
.<InetAddress> of(runningInstance.getPrivateIpAddress()), 22, LoginType.SSH); @Singleton
private static class RunningInstanceToServerMetadata implements
Function<RunningInstance, ServerMetadata> {
@Override
public ServerMetadata apply(RunningInstance from) {
return new ServerMetadataImpl(from.getInstanceId(), from.getKeyName(),
instanceToServerState.get(from.getInstanceState()), nullSafeSet(from
.getIpAddress()), nullSafeSet(from.getPrivateIpAddress()), 22,
LoginType.SSH);
}
Set<InetAddress> nullSafeSet(InetAddress in) {
if (in == null) {
return ImmutableSet.<InetAddress> of();
}
return ImmutableSet.<InetAddress> of(in);
}
} }
private RunningInstance getRunningInstance(String id) { private RunningInstance getRunningInstance(String id) {