볼륨 삭제 메소드의 디스크오퍼링 조회 Null 체크 로직 추가

jschoiRR · jschoiRR · commit 1db0f00ae0d7 · 2024-11-11T16:33:47.000+09:00
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1742,7 +1742,7 @@ public Volume destroyVolume(long volumeId, Account caller, boolean expunge, bool
 
         // check if Shared Disk
         DiskOffering offering = _diskOfferingDao.findById(volume.getDiskOfferingId());
-        if (volume.getVolumeType() == Volume.Type.DATADISK && offering.getShareable()) {
+        if (volume.getVolumeType() == Volume.Type.DATADISK && offering != null && offering.getShareable()) {
             volume.setPath("");
             _volsDao.update(volume.getId(), volume);
         }

Original file line number	Diff line number	Diff line change
`@@ -1742,7 +1742,7 @@ public Volume destroyVolume(long volumeId, Account caller, boolean expunge, bool`
`1742`	`1742`
`1743`	`1743`	`// check if Shared Disk`
`1744`	`1744`	`DiskOffering offering = _diskOfferingDao.findById(volume.getDiskOfferingId());`
`1745`		`- if (volume.getVolumeType() == Volume.Type.DATADISK && offering.getShareable()) {`
	`1745`	`+ if (volume.getVolumeType() == Volume.Type.DATADISK && offering != null && offering.getShareable()) {`
`1746`	`1746`	`volume.setPath("");`
`1747`	`1747`	`_volsDao.update(volume.getId(), volume);`
`1748`	`1748`	`}`