Author: kostat
Date: 2007-01-11 04:26:47 -0500 (Thu, 11 Jan 2007)
New Revision: 70841
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
Log:
merge -r 70839:70840
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-11 09:22:34 UTC (rev 70840)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-11 09:26:47 UTC (rev 70841)
@@ -1,3 +1,8 @@
+2007-01-10 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * ObjectDataSourceView.cs: use case unsensitive comparer for
+ parameters collection.
+
2007-01-10 Igor Zelmanovich <[EMAIL PROTECTED]>
* LoginStatus.cs: fixed: not causes page validation.
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-01-11 09:22:34 UTC (rev 70840)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-01-11 09:26:47 UTC (rev 70841)
@@ -894,8 +894,8 @@
if (method == null)
throw new InvalidOperationException
("ObjectDataSource " + owner.ID + " could not find a method named '" +
methodName + "' with parameters of type '" + DataObjectType + "' in '" +
ObjectType + "'.");
-
- paramValues = new OrderedDictionary ();
+
+ paramValues = new OrderedDictionary
(StringComparer.InvariantCultureIgnoreCase);
ParameterInfo[] ps = method.GetParameters ();
if (oldValues != null) {
@@ -990,7 +990,7 @@
/// <returns>merged values</returns>
IOrderedDictionary MergeParameterValues (ParameterCollection
viewParams, IDictionary values, IDictionary oldValues, bool allwaysAddNewValues)
{
- OrderedDictionary mergedValues = new OrderedDictionary
();
+ OrderedDictionary mergedValues = new OrderedDictionary
(StringComparer.InvariantCultureIgnoreCase);
foreach (Parameter p in viewParams) {
bool oldAdded = false;
if (oldValues != null) {
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2007-01-11 09:22:34 UTC (rev 70840)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceTest.cs
2007-01-11 09:26:47 UTC (rev 70841)
@@ -112,7 +112,7 @@
switch (action) {
case "insert": p1 = new Parameter ("ID",
TypeCode.String, "1004");
- p2 = new Parameter ("FName",
TypeCode.String, "David");
+ p2 = new Parameter ("fname",
TypeCode.String, "David");
p3 = new Parameter ("LName",
TypeCode.String, "Eli");
break;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
