Author: atsushi
Date: 2008-02-08 04:09:29 -0500 (Fri, 08 Feb 2008)
New Revision: 95225
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
trunk/olive/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
Log:
2008-02-08 Atsushi Enomoto <[EMAIL PROTECTED]>
* ServiceHostBase.cs : when listenUri is not absolute, make it
absolute before being passed to ServiceEndpoint.
Tiny message string fix ("string + string" is hard to translate).
Modified: trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
===================================================================
--- trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
2008-02-08 08:25:44 UTC (rev 95224)
+++ trunk/olive/class/System.ServiceModel/System.ServiceModel/ChangeLog
2008-02-08 09:09:29 UTC (rev 95225)
@@ -1,3 +1,9 @@
+2008-02-08 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * ServiceHostBase.cs : when listenUri is not absolute, make it
+ absolute before being passed to ServiceEndpoint.
+ Tiny message string fix ("string + string" is hard to translate).
+
2007-08-19 Atsushi Enomoto <[EMAIL PROTECTED]>
* EndpointAddressBuilder.cs ServiceBehaviorAttribute.cs :
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
2008-02-08 08:25:44 UTC (rev 95224)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
2008-02-08 09:09:29 UTC (rev 95225)
@@ -225,8 +225,7 @@
// Find a Base address with matching scheme,
// and build new absolute address
if (!base_addresses.Contains (binding.Scheme))
- throw new InvalidOperationException
("Could not find base address "
- + "that matches Scheme " +
binding.Scheme + " for endpoint " + binding.Name);
+ throw new InvalidOperationException
(String.Format ("Could not find base address that matches Scheme {0} for
endpoint {1}", binding.Scheme, binding.Name));
Uri baseaddr = base_addresses [binding.Scheme];
@@ -244,7 +243,7 @@
if (e.Contract == cd)
return e;
ServiceEndpoint se = new ServiceEndpoint (cd, binding,
address);
- se.ListenUri = listenUri;
+ se.ListenUri = listenUri.IsAbsoluteUri ? listenUri :
new Uri (address.Uri, listenUri);
Description.Endpoints.Add (se);
return se;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
