rendered paste bodyIndex: System.Web.UI.WebControls.WebParts/PersonalizableAttribute.cs
===================================================================
--- System.Web.UI.WebControls.WebParts/PersonalizableAttribute.cs (revision 68444)
+++ System.Web.UI.WebControls.WebParts/PersonalizableAttribute.cs (working copy)
@@ -125,15 +125,18 @@
{
if (type == null)
throw new ArgumentNullException ("type");
-
- List <PropertyInfo> ret = new List <PropertyInfo> ();
+
PropertyInfo[] properties = type.GetProperties ();
if (properties == null || properties.Length == 0)
- return ret;
+ return new PropertyInfo [0];
+ List <PropertyInfo> ret = null;
foreach (PropertyInfo pi in properties)
- if (PropertyQualifies (pi))
+ if (PropertyQualifies (pi)) {
+ if (ret == null)
+ ret = new List <PropertyInfo> ();
ret.Add (pi);
+ }
return ret;
}
===================================================================
--- System.Web.UI.WebControls/Menu.cs (revision 68444)
+++ System.Web.UI.WebControls/Menu.cs (working copy)
@@ -944,11 +944,11 @@
dynamicMenuItemStyle.TrackViewState ();
if (dynamicMenuStyle != null)
dynamicMenuStyle.TrackViewState ();
- if (levelMenuItemStyles != null)
+ if (levelMenuItemStyles != null && levelMenuItemStyles.Count > 0)
((IStateManager)levelMenuItemStyles).TrackViewState();
- if (levelSelectedStyles != null)
+ if (levelSelectedStyles != null && levelMenuItemStyles.Count > 0)
((IStateManager)levelSelectedStyles).TrackViewState();
- if (levelSubMenuStyles != null)
+ if (levelSubMenuStyles != null && levelSubMenuStyles.Count > 0)
((IStateManager)levelSubMenuStyles).TrackViewState();
if (dynamicSelectedStyle != null)
dynamicSelectedStyle.TrackViewState();
@@ -1178,8 +1178,8 @@
if (dynamicMenuStyle != null)
RegisterStyle (DynamicMenuStyle);
- if (levelMenuItemStyles != null) {
- levelMenuItemLinkStyles = new List<Style> ();
+ if (levelMenuItemStyles != null && levelMenuItemStyles.Count > 0) {
+ levelMenuItemLinkStyles = new List<Style> (levelMenuItemStyles.Count);
foreach (Style style in levelMenuItemStyles) {
Style linkStyle = new Style ();
levelMenuItemLinkStyles.Add (linkStyle);
@@ -1197,8 +1197,8 @@
if (dynamicSelectedStyle != null)
RegisterStyle (dynamicSelectedStyle, DynamicSelectedLinkStyle);
- if (levelSelectedStyles != null) {
- levelSelectedLinkStyles = new List<Style> ();
+ if (levelSelectedStyles != null && levelSelectedStyles.Count > 0) {
+ levelSelectedLinkStyles = new List<Style> (levelSelectedStyles.Count);
foreach (Style style in levelSelectedStyles) {
Style linkStyle = new Style ();
levelSelectedLinkStyles.Add (linkStyle);
Index: System.Web.UI.WebControls/TreeView.cs
===================================================================
--- System.Web.UI.WebControls/TreeView.cs (revision 68444)
+++ System.Web.UI.WebControls/TreeView.cs (working copy)
@@ -795,7 +795,7 @@
if (leafNodeStyle != null) {
leafNodeStyle.TrackViewState();
}
- if (levelStyles != null) {
+ if (levelStyles != null && levelStyles.Count > 0) {
((IStateManager)levelStyles).TrackViewState();
}
if (nodeStyle != null) {
@@ -1128,8 +1128,8 @@
RegisterStyle (LeafNodeStyle, LeafNodeLinkStyle);
- if (levelStyles != null) {
- levelLinkStyles = new List<Style> ();
+ if (levelStyles != null && levelStyles.Count > 0) {
+ levelLinkStyles = new List<Style> (levelStyles.Count);
foreach (Style style in levelStyles) {
Style linkStyle = new Style ();
levelLinkStyles.Add (linkStyle);