From 9a61ff2143aeba31011715fc9282db55457d03a5 Mon Sep 17 00:00:00 2001
From: Murali Reddy <murali.reddy@citrix.com>
Date: Mon, 7 Jan 2013 16:36:47 +0530
Subject: [PATCH] Missed portion of the fix for CLOUDSTACK-595 submitted by
 commit 3ffbc4320abc9fd03ad3abd1f8077cc8d8f9ed4c which caused build break.

Fixing the build break and added missing code.
---
 .../cloud/hypervisor/vmware/resource/VmwareResource.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 66c421f189d..f8d29859358 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3778,8 +3778,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                         String.format("[%s] %s.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
                     
                     dsMo.moveDatastoreFile(String.format("[%s] %s/%s-delta.vmdk", dsMo.getName(), vmdkName, vmdkName),
-                        	dcMo.getMor(), dsMo.getMor(), 
-                        	String.format("[%s] %s-delta.vmdk", dsMo.getName(), name), dcMo.getMor(), true);
+                            dcMo.getMor(), dsMo.getMor(),
+                            String.format("[%s] %s-delta.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
 
                     s_logger.info("detach disks from volume-wrapper VM " + vmdkName);
                     vmMo.detachAllDisks();
@@ -3790,7 +3790,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                     String srcFile = String.format("[%s] %s/", dsMo.getName(), vmdkName);
                     dsMo.deleteFile(srcFile, dcMo.getMor(), true);
 
-                    VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), name, cmd.getDiskCharacteristics().getSize(), null);
+                    VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), null);
                     return new CreateAnswer(cmd, vol);
                 }
             } else {