Repository: cloudstack Updated Branches: refs/heads/master ef2012677 -> 965346cad
CLOUDSTACK-6712: NPE in findJobInstanceUuid() in ApiDBUtils Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/965346ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/965346ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/965346ca Branch: refs/heads/master Commit: 965346cad15a03d8cf7ffc12460ffd8ecaf35bf1 Parents: ef20126 Author: Murali Reddy <muralimmre...@gmail.com> Authored: Tue May 20 10:21:01 2014 +0530 Committer: Murali Reddy <muralimmre...@gmail.com> Committed: Tue May 20 10:26:12 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiDBUtils.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/965346ca/server/src/com/cloud/api/ApiDBUtils.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index a953cd6..153d998 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -1442,6 +1442,12 @@ public class ApiDBUtils { String jobInstanceId = null; ApiCommandJobType jobInstanceType = EnumUtils.fromString(ApiCommandJobType.class, job.getInstanceType(), ApiCommandJobType.None); + if (job.getInstanceId() == null) { + // when assert is hit, implement 'getInstanceId' of BaseAsyncCmd and return appropriate instance id + assert (false); + return null; + } + if (jobInstanceType == ApiCommandJobType.Volume) { VolumeVO volume = ApiDBUtils.findVolumeById(job.getInstanceId()); if (volume != null) {
