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

CLOUDSTACK-4008: fix snapshot npe if its volume is deleted

This commit is contained in:
Edison Su 2013-08-01 13:57:47 -07:00
parent 3c05999354
commit ebb30898c9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/api/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
View File

@ -22,6 +22,7 @@ import com.cloud.agent.api.to.DataObjectType;
import com.cloud.agent.api.to.DataStoreTO;
import com.cloud.agent.api.to.DataTO;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
public class SnapshotObjectTO implements DataTO {
private String path;
@ -40,8 +41,12 @@ public class SnapshotObjectTO implements DataTO {
public SnapshotObjectTO(SnapshotInfo snapshot) {
this.path = snapshot.getPath();
this.setId(snapshot.getId());
this.volume = (VolumeObjectTO) snapshot.getBaseVolume().getTO();
this.setVmName(snapshot.getBaseVolume().getAttachedVmName());
VolumeInfo vol = snapshot.getBaseVolume();
if (vol != null) {
this.volume = (VolumeObjectTO)vol.getTO();
this.setVmName(vol.getAttachedVmName());
}
SnapshotInfo parentSnapshot = snapshot.getParent();
if (parentSnapshot != null) {
this.parentSnapshotPath = parentSnapshot.getPath();

3
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
View File

@ -74,6 +74,9 @@ public class VolumeDataFactoryImpl implements VolumeDataFactory {
@Override
public VolumeInfo getVolume(long volumeId) {
VolumeVO volumeVO = volumeDao.findById(volumeId);
if (volumeVO == null) {
return null;
}
VolumeObject vol = null;
if (volumeVO.getPoolId() == null) {
DataStore store = null;