You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/01/27 15:56:16 UTC
[1/2] git commit: updated refs/heads/master to f280bbe
Repository: cloudstack
Updated Branches:
refs/heads/master c07c850df -> f280bbe9e
CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.
Summary: listVolumes API fails when volume associated vm instance has NULL or invalid state. Fix the code to guard this situation since this should not block volume listing.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3777632
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3777632
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3777632
Branch: refs/heads/master
Commit: c3777632c5817cc1e635ee59eb18d6cb4f210e29
Parents: 06cefaf
Author: Suresh Kumar Anaparti <su...@citrix.com>
Authored: Tue Sep 15 16:22:06 2015 +0530
Committer: Suresh Kumar Anaparti <su...@citrix.com>
Committed: Tue Sep 15 16:22:06 2015 +0530
----------------------------------------------------------------------
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3777632/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 68a578f..7540d24 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -83,14 +83,18 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
volResponse.setZoneId(volume.getDataCenterUuid());
volResponse.setZoneName(volume.getDataCenterName());
- volResponse.setVolumeType(volume.getVolumeType().toString());
+ if (volume.getVolumeType() != null) {
+ volResponse.setVolumeType(volume.getVolumeType().toString());
+ }
volResponse.setDeviceId(volume.getDeviceId());
long instanceId = volume.getVmId();
if (instanceId > 0 && volume.getState() != Volume.State.Destroy) {
volResponse.setVirtualMachineId(volume.getVmUuid());
volResponse.setVirtualMachineName(volume.getVmName());
- volResponse.setVirtualMachineState(volume.getVmState().toString());
+ if (volume.getVmState() != null) {
+ volResponse.setVirtualMachineState(volume.getVmState().toString());
+ }
if (volume.getVmDisplayName() != null) {
volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
} else {
@@ -98,7 +102,9 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
}
}
- volResponse.setProvisioningType(volume.getProvisioningType().toString());
+ if (volume.getProvisioningType() != null) {
+ volResponse.setProvisioningType(volume.getProvisioningType().toString());
+ }
// Show the virtual size of the volume
volResponse.setSize(volume.getSize());
@@ -107,7 +113,9 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO, Long> implem
volResponse.setMaxIops(volume.getMaxIops());
volResponse.setCreated(volume.getCreated());
- volResponse.setState(volume.getState().toString());
+ if (volume.getState() != null) {
+ volResponse.setState(volume.getState().toString());
+ }
if (volume.getState() == Volume.State.UploadOp) {
// com.cloud.storage.VolumeHostVO volumeHostRef =
// ApiDBUtils.findVolumeHostRef(volume.getId(),
[2/2] git commit: updated refs/heads/master to f280bbe
Posted by bh...@apache.org.
Merge pull request #830 from sureshanaparti/CLOUDSTACK-8858
CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.
Summary: listVolumes API fails when volume associated vm instance has NULL or invalid state. Fix the code to guard this situation since this should not block volume listing.
* pr/830:
CLOUDSTACK-8858: listVolumes API fails for a particular domain with NPE.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f280bbe9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f280bbe9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f280bbe9
Branch: refs/heads/master
Commit: f280bbe9e4cd8bdcc59f73e32885fa8f7616e342
Parents: c07c850 c377763
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 15:56:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 15:56:07 2016 +0100
----------------------------------------------------------------------
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f280bbe9/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------