cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/4.3 to bc86103
Date Fri, 06 Dec 2013 06:38:55 GMT
Updated Branches:
  refs/heads/4.3 d21058c25 -> bc86103c2


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/bc86103c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc86103c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc86103c

Branch: refs/heads/4.3
Commit: bc86103c2b1afc4b0bb437d75487bdda26a5958f
Parents: d21058c
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Fri Dec 6 11:46:29 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Fri Dec 6 12:00:44 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/bc86103c/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 fbbbc13..38f5b24 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1517,7 +1517,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"))
{


Mime
View raw message