Repository: jclouds-labs Updated Branches: refs/heads/1.9.x 498f1d820 -> 55e5b45d7
JCLOUDS-1023: Fix DigitalOcean getImage() method Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/55e5b45d Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/55e5b45d Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/55e5b45d Branch: refs/heads/1.9.x Commit: 55e5b45d792647bf8a15126b2ffa2e2f0db51473 Parents: 498f1d8 Author: Ignasi Barrera <[email protected]> Authored: Thu Oct 22 11:13:30 2015 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Oct 22 12:56:32 2015 +0200 ---------------------------------------------------------------------- .../digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/55e5b45d/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java b/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java index ec8dc11..f1f5919 100644 --- a/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/DigitalOcean2ComputeServiceAdapter.java +++ b/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
