2010-02-10 Atsushi Enomoto <atsushi@ximian.com>

        * MessageHeaders.cs : add !NET_2_1.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 6a63ccfa4d966833bfd2e774a0f1a9c1164914d8..2f42aa7d5b7216008e3183975524d8ad159f116d 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * MessageHeaders.cs : add !NET_2_1.
+

 2010-02-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * MessageHeader.cs, MessageHeaders.cs : add nasty workaround for
 2010-02-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * MessageHeader.cs, MessageHeaders.cs : add nasty workaround for

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
index 30db7c81cbe982e7de98e10d071dcbff5786f915..8b9016b622a1690ed576c7247b43809de11c9e7f 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
@@ -339,8 +339,10 @@ namespace System.ServiceModel.Channels
                                return;
                        if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressing10))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddress10.FromEndpointAddress (address)));
                                return;
                        if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressing10))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddress10.FromEndpointAddress (address)));

+#if !NET_2_1

                        else if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressingAugust2004))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddressAugust2004.FromEndpointAddress (address)));
                        else if (MessageVersion.Addressing.Equals (AddressingVersion.WSAddressingAugust2004))
                                Add (MessageHeader.CreateHeader (name, ns, EndpointAddressAugust2004.FromEndpointAddress (address)));

+#endif

                        else
                                throw new InvalidOperationException ("WS-Addressing header is not allowed for AddressingVersion.None");
                }
                        else
                                throw new InvalidOperationException ("WS-Addressing header is not allowed for AddressingVersion.None");
                }