From 63e92a4ea6766212d4450cde3cf205d661a6419d Mon Sep 17 00:00:00 2001
From: Isaac Chiang <isaacchiang@gmail.com>
Date: Mon, 20 May 2013 08:54:13 +0800
Subject: [PATCH] CLOUDSTACK-1871 : domainId parameter to uploadVolume not
 working

1. Remove duplicated lines for setting domainId.
2. Set domainId with owner's domain if the owner is specified.
---
 server/src/com/cloud/storage/VolumeManagerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index 2f4b2c8d8a6..55e20cf0273 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -708,19 +708,19 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
 
         VolumeVO volume = new VolumeVO(volumeName, zoneId, -1, -1, -1,
                 new Long(-1), null, null, 0, Volume.Type.DATADISK);
+        Account owner = (caller.getId() == ownerId) ? caller : _accountMgr
+                          .getActiveAccountById(ownerId);
         volume.setPoolId(null);
         volume.setDataCenterId(zoneId);
         volume.setPodId(null);
         volume.setAccountId(ownerId);
-        volume.setDomainId(((caller == null) ? Domain.ROOT_DOMAIN : caller
-                .getDomainId()));
         long diskOfferingId = _diskOfferingDao.findByUniqueName(
                 "Cloud.com-Custom").getId();
         volume.setDiskOfferingId(diskOfferingId);
         // volume.setSize(size);
         volume.setInstanceId(null);
         volume.setUpdated(new Date());
-        volume.setDomainId((caller == null) ? Domain.ROOT_DOMAIN : caller
+        volume.setDomainId((owner == null) ? Domain.ROOT_DOMAIN : owner
                 .getDomainId());
 
         volume = _volsDao.persist(volume);