Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-16 15:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1014 from ahgittin/fix/cloudstack-niggles

Browse Source 
fix cloudstack network NPE, and 2 logging cleanups
This commit is contained in:
Adrian Cole 2012-12-01 11:12:17 -08:00
commit 39bf8f9897
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
View File

@ -175,7 +175,7 @@ public class CloudStackComputeServiceAdapter implements
String templateId = template.getImage().getId(); String templateId = template.getImage().getId();
String serviceOfferingId = template.getHardware().getId(); String serviceOfferingId = template.getHardware().getId();
logger.info("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId, logger.debug("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId,
zoneId, options); zoneId, options);
AsyncCreateResponse job = client.getVirtualMachineClient().deployVirtualMachineInZone(zoneId, serviceOfferingId, AsyncCreateResponse job = client.getVirtualMachineClient().deployVirtualMachineInZone(zoneId, serviceOfferingId,
templateId, options); templateId, options);

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
View File

@ -35,12 +35,12 @@ public class PublicIPAddressPredicates {
private final String networkId; private final String networkId;
public AssociatedWithNetwork(String networkId) { public AssociatedWithNetwork(String networkId) {
this.networkId = networkId; this.networkId = checkNotNull(networkId, "networkId");
} }
@Override @Override
public boolean apply(PublicIPAddress input) { public boolean apply(PublicIPAddress input) {
return checkNotNull(input, "ipaddress").getAssociatedNetworkId().equals(networkId); return networkId.equals(checkNotNull(input, "ipaddress").getAssociatedNetworkId());
} }
@Override @Override

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
View File

@ -26,7 +26,6 @@ import javax.annotation.Resource;
import javax.inject.Inject; import javax.inject.Inject;
import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.CloudStackClient;
import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.domain.User; import org.jclouds.cloudstack.domain.User;
import org.jclouds.cloudstack.predicates.UserPredicates; import org.jclouds.cloudstack.predicates.UserPredicates;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
@ -66,9 +65,6 @@ public class GetCurrentUser implements Supplier<User> {
users)); users));
} }
if (currentUser.getAccountType() != Account.Type.USER) {
logger.warn("Expecting an user account: %s", currentUser);
}
return currentUser; return currentUser;
} }
} }