2009-08-17 Atsushi Enomoto <atsushi@ximian.com>

	* MessageHeaders.cs : when the value is null, do not try to
	  deserialize EndpointAddress.

svn path=/trunk/mcs/; revision=140042

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index d86b92277c82008cc451b4b5218df93402551aac..dc95b047c653de8b0a456fda7db544a05eb57c40 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * MessageHeaders.cs : when the value is null, do not try to
+         deserialize EndpointAddress.
+
 2009-08-17  Atsushi Enomoto  <atsushi@ximian.com>
 
         * MessageHeader.cs : add Value property. (Forgot dependent change.)

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
index c38cdea9ba6c349c9075f54299d8b58f8805954a..902f180ac9b5e891c5880c61b3ffe61d08e13cf5 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
@@ -164,7 +164,7 @@ namespace System.ServiceModel.Channels
                                return (T) dmh.Value;
                        if (typeof (T) == typeof (EndpointAddress)) {
                                XmlDictionaryReader r = GetReaderAtHeader (index);
-                               return (T) (object) new EndpointAddress (r.ReadElementContentAsString ());
+                               return r.NodeType != XmlNodeType.Element ? default (T) : (T) (object) new EndpointAddress (r.ReadElementContentAsString ());
                        }
                        else
                                return GetHeader<T> (index, GetSerializer<T> (index));