diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 073e4c27618..49a6ebaa036 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -1279,9 +1279,11 @@ public class ApiDBUtils { } public static String findJobInstanceUuid(AsyncJob job){ - if ( job == null ) + if ( job == null || job.getInstanceId() == null) return null; + String jobInstanceId = null; + if (job.getInstanceType() == AsyncJob.Type.Volume) { VolumeVO volume = ApiDBUtils.findVolumeById(job.getInstanceId()); if (volume != null) {