Author: kostat
Date: 2007-04-30 09:54:00 -0400 (Mon, 30 Apr 2007)
New Revision: 76494

Modified:
   
branches/mainsoft/gh20/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
Log:
merge -r76490:76491

Modified: 
branches/mainsoft/gh20/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
===================================================================
--- 
branches/mainsoft/gh20/mcs/class/System.Data/System.Data.Common/DataAdapter.cs  
    2007-04-30 13:53:13 UTC (rev 76493)
+++ 
branches/mainsoft/gh20/mcs/class/System.Data/System.Data.Common/DataAdapter.cs  
    2007-04-30 13:54:00 UTC (rev 76494)
@@ -561,6 +561,9 @@
                }
 
 #if NET_2_0
+#if TARGET_JVM
+               [Description("SkipJavaOutputValidation")]
+#endif
                public virtual int Fill (DataSet dataSet)
                {
                        throw new NotSupportedException();

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

Reply via email to