Author: krasnov
Date: 2007-01-02 08:57:57 -0500 (Tue, 02 Jan 2007)
New Revision: 70362

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
Log:
* SqlDataSourceView.cs,ObjectDataSourceView.cs: fixed parameter merge when 
values and old values are null

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-01-02 13:56:58 UTC (rev 70361)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-01-02 13:57:57 UTC (rev 70362)
@@ -1,5 +1,10 @@
-2006-12-27 Igor Zelmanovich <[EMAIL PROTECTED]>
+2007-01-02  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
+       * SqlDataSourceView.cs,ObjectDataSourceView.cs: fixed parameter merge
+       when values and old values are null
+
+2006-01-02 Igor Zelmanovich <[EMAIL PROTECTED]>
+
        * ListControl.cs: reverted r70112, fixed in r70319.      
 
 2007-01-02 Igor Zelmanovich <[EMAIL PROTECTED]>

Modified: 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
--- 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs    
    2007-01-02 13:56:58 UTC (rev 70361)
+++ 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs    
    2007-01-02 13:57:57 UTC (rev 70362)
@@ -618,7 +618,7 @@
                        MethodInfo method;
                        
                        if (DataObjectTypeName.Length == 0) {
-                               paramValues = MergeParameterValues 
(DeleteParameters, null, oldDataValues, false);
+                               paramValues = MergeParameterValues 
(DeleteParameters, null, oldDataValues, true);
                                method = GetObjectMethod (DeleteMethod, 
paramValues);
                        } else {
                                method = ResolveDataObjectMethod (DeleteMethod, 
oldDataValues, null, out paramValues);

Modified: 
trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs   
2007-01-02 13:56:58 UTC (rev 70361)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs   
2007-01-02 13:57:57 UTC (rev 70362)
@@ -95,7 +95,7 @@
                        else
                                oldDataValues = keys;
                        
-                       InitializeParameters (command, DeleteParameters, null, 
oldDataValues, false);
+                       InitializeParameters (command, DeleteParameters, null, 
oldDataValues, true);
 
                        OnDeleting (new SqlDataSourceCommandEventArgs 
(command));
 

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

Reply via email to