apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7735: Set null for templateId instead of -1 for usage records

Browse Source 
status 7735: resolved fixed
This commit is contained in:
kishan 2010-12-29 18:29:14 +05:30
parent f865e8b061
commit 494a46a10f
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -664,12 +664,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
Transaction txn = Transaction.currentTxn();
txn.start();
// Create an event
long templateId = -1;
long diskOfferingId = -1;
if(originalVolume.getTemplateId() != null){
templateId = originalVolume.getTemplateId();
}
diskOfferingId = originalVolume.getDiskOfferingId();
Long templateId = originalVolume.getTemplateId();;
Long diskOfferingId = originalVolume.getDiskOfferingId();
long sizeMB = createdVolume.getSize()/(1024*1024);
if (createdVolume.getPath() != null) {

8
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1123,12 +1123,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
for (VolumeVO volume : volumes) {
_volsDao.recoverVolume(volume.getId());
// Create an event
long templateId = -1;
long diskOfferingId = -1;
if(volume.getTemplateId() !=null){
templateId = volume.getTemplateId();
}
diskOfferingId = volume.getDiskOfferingId();
Long templateId = volume.getTemplateId();
Long diskOfferingId = volume.getDiskOfferingId();
long sizeMB = volume.getSize()/(1024*1024);
StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
EventUtils.saveEvent(User.UID_SYSTEM, volume.getAccountId(), EventTypes.EVENT_VOLUME_CREATE, "Created volume: "+ volume.getName() +" with size: " + sizeMB + " MB in pool: " + pool.getName());