You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/12/06 07:41:10 UTC
git commit: updated refs/heads/master to e6127a7
Updated Branches:
refs/heads/master cafd820e3 -> e6127a7c0
CLOUDSTACK-5216. delete volume failed due to Exception: java.lang.Exception" while destroying Vms
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6127a7c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6127a7c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6127a7c
Branch: refs/heads/master
Commit: e6127a7c00cb663ae10a1f19b9c2c0b0310768d2
Parents: cafd820
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Dec 6 11:46:29 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Fri Dec 6 12:04:02 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6127a7c/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 455c85d..747d5d6 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1474,7 +1474,9 @@ public class VmwareStorageProcessor implements StorageProcessor {
vmMo.destroy();
// this.hostService.handleDatastoreAndVmdkDetach(iScsiName, storageHost, storagePort);
- this.hostService.removeManagedTargetsFromCluster(managedIqns);
+ if (managedIqns != null && !managedIqns.isEmpty()) {
+ this.hostService.removeManagedTargetsFromCluster(managedIqns);
+ }
for (NetworkDetails netDetails : networks) {
if (netDetails.getGCTag() != null && netDetails.getGCTag().equalsIgnoreCase("true")) {