From 75def45063db5b8a0c4bb06e57f167df66ce6a37 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Fri, 4 Mar 2011 15:38:07 +0530
Subject: [PATCH] bug 8536: Added delete volume usage event for Data volumes
 also when Vm goes to Error state status 8536: resolved fixed

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index c0bfb9f12e3..6d7b43b5c47 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1475,7 +1475,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
 				for(VolumeVO volume : volumesForThisVm) {
 				    try {
                         _storageMgr.destroyVolume(volume);
-                        if ((volume.getStatus() == AsyncInstanceCreateStatus.Created) && (volume.getVolumeType().equals(VolumeType.ROOT))) {
+                        if (volume.getStatus() == AsyncInstanceCreateStatus.Created) {
                             UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(),
                                     volume.getName());
                             _usageEventDao.persist(usageEvent);