Author: igorz
Date: 2007-03-28 08:36:17 -0500 (Wed, 28 Mar 2007)
New Revision: 75073

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
Log:
2007-03-28 Igor Zelmanovich <[EMAIL PROTECTED]>

        * Menu.cs:
        * TreeView:
        avoid Exception if HierarchicalDataSourceView.Select() returns null.


Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-03-28 13:22:49 UTC (rev 75072)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-03-28 13:36:17 UTC (rev 75073)
@@ -1,3 +1,9 @@
+2007-03-28 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * Menu.cs:
+       * TreeView:
+       avoid Exception if HierarchicalDataSourceView.Select() returns null.
+
 2007-03-22 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * ObjectDataSource.cs:

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs        
2007-03-28 13:22:49 UTC (rev 75072)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs        
2007-03-28 13:36:17 UTC (rev 75073)
@@ -856,7 +856,10 @@
                        EnsureChildControlsDataBound ();
                }
 
-               private void FillBoundChildrenRecursive 
(IHierarchicalEnumerable hEnumerable, MenuItemCollection itemCollection) {
+               private void FillBoundChildrenRecursive 
(IHierarchicalEnumerable hEnumerable, MenuItemCollection itemCollection)
+               {
+                       if (hEnumerable == null)
+                               return;
                        foreach (object obj in hEnumerable) {
                                IHierarchyData hdata = 
hEnumerable.GetHierarchyData (obj);
                                MenuItem item = new MenuItem ();

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2007-03-28 13:22:49 UTC (rev 75072)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2007-03-28 13:36:17 UTC (rev 75073)
@@ -979,7 +979,10 @@
                        FillBoundChildrenRecursive (e, Nodes);
                }
                
-               private void FillBoundChildrenRecursive 
(IHierarchicalEnumerable hEnumerable, TreeNodeCollection nodeCollection) {
+               private void FillBoundChildrenRecursive 
(IHierarchicalEnumerable hEnumerable, TreeNodeCollection nodeCollection)
+               {
+                       if (hEnumerable == null)
+                               return;
                        foreach (object obj in hEnumerable) {
                                IHierarchyData hdata = 
hEnumerable.GetHierarchyData (obj);
                                TreeNode child = new TreeNode ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to