Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1381: Fix NPE in GCE DiskURIToImage

This commit is contained in:
Ignasi Barrera 2018-02-15 11:55:40 +01:00
parent 992e60d82d
commit 06e10864c2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/loaders/DiskURIToImage.java
View File

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