Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1059 from MihaelaStoica/CA-203345

Browse Source 
CA-203345: Exporting snapshot jams and cant be cancelled (when export…
This commit is contained in:
Konstantina Chremmou 2016-07-14 11:26:17 +01:00 committed by GitHub
commit 91d2715a00
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenModel/Actions/VM/ExportVmAction.cs
View File

@ -131,7 +131,7 @@ namespace XenAdmin.Actions
// which probably means there was an exception in the GUI code before the
// action got going. Kill the task so that we don't block forever on
// taskThread.Join(). Brought to light by CA-11100.
XenAPI.Task.destroy(this.Session, this.RelatedTask.opaque_ref);
DestroyTask();
}
// Test for null: don't overwrite a previous exception
if (_exception == null)

2
XenModel/WLB/WlbReportAction.cs
View File

@ -117,7 +117,7 @@ namespace XenAdmin.Actions.Wlb
// which probably means there was an exception in the GUI code before the
// action got going. Kill the task so that we don't block forever on
// taskThread.Join(). Brought to light by CA-11100.
XenAPI.Task.destroy(Session, RelatedTask.opaque_ref);
DestroyTask();
}
if (exception == null)
exception = e;