> @@ -174,9 +178,15 @@ protected Hardware
> findHardwareForServerOrNull(ServerInZone serverInZone) {
> }
>
> protected OperatingSystem findOperatingSystemForServerOrNull(ServerInZone
> serverInZone) {
> - Image image = findObjectOfTypeForServerOrNull(images.get(), "image",
> serverInZone.getServer().getImage().getId(),
> - serverInZone);
> - return (image != null) ? image.getOperatingSystem() : null;
> + if (serverInZone.getServer().getImage() != null) {
> + Image image = findObjectOfTypeForServerOrNull(
> + images.get(), "image",
> serverInZone.getServer().getImage().getId(), serverInZone);
> +
> + return (image != null) ? image.getOperatingSystem() : null;
> + } else {
> + return null;
> + }
I'm okay with it the way it is. I think it's more clear that way. The more
common case is what's being tested, as it should be.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/421/files#r14155326
