2009-02-04 Atsushi Enomoto <atsushi@ximian.com>

	* BaseMessagesFormatter.cs : do not use non-2.1 CreateInstance().

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs
index 7e1e3a8c485ff19c4eed4e71e47e5426875802f9..dbe680b6e56c4a81486c81e2fad685d05b87cba2 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/BaseMessagesFormatter.cs
@@ -146,7 +146,11 @@ namespace System.ServiceModel.Dispatcher
 
                        object [] parts = MessageToParts (md, message);
                        if (md.MessageType != null) {
+#if NET_2_1
+                               parameters [0] = Activator.CreateInstance (md.MessageType);
+#else
                                parameters [0] = Activator.CreateInstance (md.MessageType, true);
+#endif
                                PartsToMessageObject (md, parts, parameters [0]);
                        }
                        else
@@ -167,7 +171,11 @@ namespace System.ServiceModel.Dispatcher
 
                        object [] parts = MessageToParts (md, message);
                        if (md.MessageType != null) {
+#if NET_2_1
+                               object msgObject = Activator.CreateInstance (md.MessageType);
+#else
                                object msgObject = Activator.CreateInstance (md.MessageType, true);
+#endif
                                PartsToMessageObject (md, parts, msgObject);
                                return msgObject;
                        }

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
index 7c4614fd6c4a9bc9997b80bf23be7869a3a21e87..e9fe6a368e55fdcb1d8ce19f64506ea48e41acce 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-04  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * BaseMessagesFormatter.cs : do not use non-2.1 CreateInstance().
+
 2008-06-18  Noam Lampert <noaml@mainsoft.com>
 
        * ChannelDispatcher.cs: Avoid aborting host process on faulty input message.