Author: mhabersack
Date: 2007-09-05 16:58:39 -0400 (Wed, 05 Sep 2007)
New Revision: 85382

Modified:
   trunk/mcs/class/System/System/ChangeLog
   trunk/mcs/class/System/System/UriTypeConverter.cs
Log:
ConvertTo must pass the uri kind to the constructor used in
          InstanceDescriptor.


Modified: trunk/mcs/class/System/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/System/ChangeLog     2007-09-05 20:53:09 UTC (rev 
85381)
+++ trunk/mcs/class/System/System/ChangeLog     2007-09-05 20:58:39 UTC (rev 
85382)
@@ -4,6 +4,8 @@
        for both relative and absolute URIs.
        Conversion to a string or an InstanceDescriptor must not assume
        that the uri is absolute.
+       ConvertTo must pass the uri kind to the constructor used in
+       InstanceDescriptor.
 
 2007-08-01  Atsushi Enomoto  <[EMAIL PROTECTED]>
 

Modified: trunk/mcs/class/System/System/UriTypeConverter.cs
===================================================================
--- trunk/mcs/class/System/System/UriTypeConverter.cs   2007-09-05 20:53:09 UTC 
(rev 85381)
+++ trunk/mcs/class/System/System/UriTypeConverter.cs   2007-09-05 20:58:39 UTC 
(rev 85382)
@@ -102,8 +102,8 @@
                                if (destinationType == typeof (Uri))
                                        return uri;
                                if (destinationType == typeof 
(InstanceDescriptor)) {
-                                       ConstructorInfo ci = typeof 
(Uri).GetConstructor (new Type [1] { typeof (string) });
-                                       return new InstanceDescriptor (ci , new 
object [] { uri.ToString ()});
+                                       ConstructorInfo ci = typeof 
(Uri).GetConstructor (new Type [2] { typeof (string), typeof (UriKind) });
+                                       return new InstanceDescriptor (ci , new 
object [] { uri.ToString (), uri.IsAbsoluteUri ? UriKind.Absolute : 
UriKind.Relative });
                                }
                        }
 

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

Reply via email to