commit 7aed4bc88ccd4748c46bb0fa144ff9185a559e94
author Ignasi Barrera <nacx@apache.org> Thu Feb 15 11:55:40 2018 +0100
committer Ignasi Barrera <nacx@apache.org> Fri Feb 16 08:30:07 2018 +0100
tree 04bbc34caacf2ef2bbb4667d3f1de982fa6e2cad
parent 50ae6828f52cebe4dffab518c4d5053d93b2a494

JCLOUDS-1381: Fix NPE in GCE DiskURIToImage

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 @@
    @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);