From 153dca3ddf30b5ac18ebabd666b2d43c52101623 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Wed, 29 Sep 2010 18:29:07 +0530
Subject: [PATCH] bug 6195: removed service offering Id for ROOT volumes in
 usage data

---
 server/src/com/cloud/storage/StorageManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 3b30f4863fd..1d885992095 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -910,14 +910,16 @@ public class StorageManagerImpl implements StorageManager {
         	}
         	
             long templateId = -1;
+            long doId = v.getDiskOfferingId();
         	if(v.getVolumeType() == VolumeType.ROOT && Storage.ImageFormat.ISO != template.getFormat()){
         	        templateId = template.getId();
+        	        doId = -1;
         	}
         	
         	long volumeId = v.getId();
         	// Create an event
             long sizeMB = v.getSize() / (1024 * 1024);
-        	String eventParams = "id=" + volumeId + "\ndoId=" + v.getDiskOfferingId() + "\ntId=" + templateId + "\ndcId=" + dc.getId() + "\nsize=" + sizeMB;
+        	String eventParams = "id=" + volumeId + "\ndoId=" + doId + "\ntId=" + templateId + "\ndcId=" + dc.getId() + "\nsize=" + sizeMB;
         	EventVO event = new EventVO();
         	event.setAccountId(account.getId());
         	event.setUserId(1L);