Repository: jclouds Updated Branches: refs/heads/master 50ae6828f -> 7aed4bc88
JCLOUDS-1381: Fix NPE in GCE DiskURIToImage Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7aed4bc8 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7aed4bc8 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7aed4bc8 Branch: refs/heads/master Commit: 7aed4bc88ccd4748c46bb0fa144ff9185a559e94 Parents: 50ae682 Author: Ignasi Barrera <[email protected]> Authored: Thu Feb 15 11:55:40 2018 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Fri Feb 16 08:30:07 2018 +0100 ---------------------------------------------------------------------- .../googlecomputeengine/compute/loaders/DiskURIToImage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/7aed4bc8/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java index 0f98098..470cd9e 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java @@ -45,9 +45,11 @@ public class DiskURIToImage extends CacheLoader<URI, Optional<Image>> { @Override public Optional<Image> load(URI key) throws ExecutionException { try { + Image image = null; Disk disk = resources.disk(key); - URI sourceImage = disk.sourceImage(); - Image image = sourceImage != null ? resources.image(sourceImage) : null; + if (disk != null && disk.sourceImage() != null) { + image = resources.image(disk.sourceImage()); + } return Optional.fromNullable(image); } catch (Exception e) { throw new ExecutionException(message(key, e), e);
