JCLOUDS-1023: Fix DigitalOcean getImage() method
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/62545262 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/62545262 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/62545262 Branch: refs/heads/master Commit: 6254526296117616cc6c3aacc26167296b6c0277 Parents: 26210fe Author: Ignasi Barrera <[email protected]> Authored: Thu Oct 22 11:13:30 2015 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 22 11:13:30 2015 +0200 ---------------------------------------------------------------------- .../digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/62545262/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java index ec8dc11..f1f5919 100644 --- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java +++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java @@ -179,7 +179,7 @@ public class DigitalOcean2ComputeServiceAdapter implements ComputeServiceAdapter // provided. If it can be parsed as a number, use the method to get by ID. Otherwise, get by slug. Integer numericId = Ints.tryParse(imageId); Image image = numericId == null ? api.imageApi().get(imageId) : api.imageApi().get(numericId); - return ImageInRegion.create(image, region); + return image == null ? null : ImageInRegion.create(image, region); } @Override
