You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/02/16 07:31:31 UTC
jclouds git commit: JCLOUDS-1381: Fix NPE in GCE DiskURIToImage
Repository: jclouds
Updated Branches:
refs/heads/2.0.x 992e60d82 -> 06e10864c
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/06e10864
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/06e10864
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/06e10864
Branch: refs/heads/2.0.x
Commit: 06e10864c294f91bdda9f79e8a1096f4cea69c1a
Parents: 992e60d
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Feb 15 11:55:40 2018 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Feb 16 08:31:17 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/06e10864/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);