Merge pull request xenserver#1310 from mcintyre94/CA-232963

Mihaela Stoica · web-flow · commit c437d10bc866 · 2016-11-24T17:17:33.000Z
[CA-232963] XC hangs after restarting toolstack while viewing PVS tab
diff --git a/XenAdmin/TabPages/PvsPage.cs b/XenAdmin/TabPages/PvsPage.cs
@@ -49,6 +49,8 @@ public partial class PvsPage : BaseTabPage
         private SelectionManager disableSelectionManager;
 
         private DataGridViewVms_DefaultSort vmDefaultSort;
+
+        private readonly CollectionChangeEventHandler PvsProxy_CollectionChangedWithInvoke;
         
         public PvsPage()
         {
@@ -61,7 +63,9 @@ public PvsPage()
             disableSelectionManager = new SelectionManager();
 
             vmDefaultSort = new DataGridViewVms_DefaultSort();
-            
+
+            PvsProxy_CollectionChangedWithInvoke = Program.ProgramInvokeHandler(PvsProxyCollectionChanged);
+
             base.Text = Messages.PVS_TAB_TITLE;
         }
 
@@ -75,16 +79,16 @@ public IXenConnection Connection
             {
                 if (connection != null)
                 {
-                    connection.Cache.DeregisterCollectionChanged<PVS_proxy>(PvsProxyCollectionChanged);
-                    connection.Cache.DeregisterCollectionChanged<VM>(PvsProxyCollectionChanged);
+                    connection.Cache.DeregisterCollectionChanged<PVS_proxy>(PvsProxy_CollectionChangedWithInvoke);
+                    connection.Cache.DeregisterCollectionChanged<VM>(PvsProxy_CollectionChangedWithInvoke);
                 }
 
                 connection = value;
 
                 if (connection != null)
                 {
-                    connection.Cache.RegisterCollectionChanged<PVS_proxy>(PvsProxyCollectionChanged);
-                    connection.Cache.RegisterCollectionChanged<VM>(PvsProxyCollectionChanged);
+                    connection.Cache.RegisterCollectionChanged<PVS_proxy>(PvsProxy_CollectionChangedWithInvoke);
+                    connection.Cache.RegisterCollectionChanged<VM>(PvsProxy_CollectionChangedWithInvoke);
                 }
 
                 LoadVMs();
@@ -283,7 +287,7 @@ void dataGridViewVms_SortCompare(object sender, DataGridViewSortCompareEventArgs
 
         private void PvsProxyCollectionChanged(object sender, CollectionChangeEventArgs e)
         {
-            Program.Invoke(this, LoadVMs);
+            LoadVMs();
         }
 
         private void VmPropertyChanged(object sender, PropertyChangedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public partial class PvsPage : BaseTabPage`
`49`	`49`	`private SelectionManager disableSelectionManager;`
`50`	`50`
`51`	`51`	`private DataGridViewVms_DefaultSort vmDefaultSort;`
	`52`	`+`
	`53`	`+ private readonly CollectionChangeEventHandler PvsProxy_CollectionChangedWithInvoke;`
`52`	`54`
`53`	`55`	`public PvsPage()`
`54`	`56`	`{`
`@@ -61,7 +63,9 @@ public PvsPage()`
`61`	`63`	`disableSelectionManager = new SelectionManager();`
`62`	`64`
`63`	`65`	`vmDefaultSort = new DataGridViewVms_DefaultSort();`
`64`		`-`
	`66`	`+`
	`67`	`+ PvsProxy_CollectionChangedWithInvoke = Program.ProgramInvokeHandler(PvsProxyCollectionChanged);`
	`68`	`+`
`65`	`69`	`base.Text = Messages.PVS_TAB_TITLE;`
`66`	`70`	`}`
`67`	`71`
`@@ -75,16 +79,16 @@ public IXenConnection Connection`
`75`	`79`	`{`
`76`	`80`	`if (connection != null)`
`77`	`81`	`{`
`78`		`- connection.Cache.DeregisterCollectionChanged<PVS_proxy>(PvsProxyCollectionChanged);`
`79`		`- connection.Cache.DeregisterCollectionChanged<VM>(PvsProxyCollectionChanged);`
	`82`	`+ connection.Cache.DeregisterCollectionChanged<PVS_proxy>(PvsProxy_CollectionChangedWithInvoke);`
	`83`	`+ connection.Cache.DeregisterCollectionChanged<VM>(PvsProxy_CollectionChangedWithInvoke);`
`80`	`84`	`}`
`81`	`85`
`82`	`86`	`connection = value;`
`83`	`87`
`84`	`88`	`if (connection != null)`
`85`	`89`	`{`
`86`		`- connection.Cache.RegisterCollectionChanged<PVS_proxy>(PvsProxyCollectionChanged);`
`87`		`- connection.Cache.RegisterCollectionChanged<VM>(PvsProxyCollectionChanged);`
	`90`	`+ connection.Cache.RegisterCollectionChanged<PVS_proxy>(PvsProxy_CollectionChangedWithInvoke);`
	`91`	`+ connection.Cache.RegisterCollectionChanged<VM>(PvsProxy_CollectionChangedWithInvoke);`
`88`	`92`	`}`
`89`	`93`
`90`	`94`	`LoadVMs();`
`@@ -283,7 +287,7 @@ void dataGridViewVms_SortCompare(object sender, DataGridViewSortCompareEventArgs`
`283`	`287`
`284`	`288`	`private void PvsProxyCollectionChanged(object sender, CollectionChangeEventArgs e)`
`285`	`289`	`{`
`286`		`- Program.Invoke(this, LoadVMs);`
	`290`	`+ LoadVMs();`
`287`	`291`	`}`
`288`	`292`
`289`	`293`	`private void VmPropertyChanged(object sender, PropertyChangedEventArgs e)`