Merge pull request #4540 from kumpera/android-changes-part1

[mono.git] / mcs / class / System.ServiceModel / System.ServiceModel.Description / TypedMessageConverter.cs

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
index 3285eb1609c02510ebe1a0aff939cc1f7bb35167..aff8033dacdd3f22cc962b1fecc0036adac2a28d 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
@@ -73,50 +73,50 @@ namespace System.ServiceModel.Description
                }
 
                public static TypedMessageConverter Create (
-                       Type type, string action)
+                       Type messageContract, string action)
                {
-                       return Create (type, action, TempUri);
+                       return Create (messageContract, action, TempUri);
                }
 
                public static TypedMessageConverter Create (
-                       Type type, string action,
+                       Type messageContract, string action,
                        string defaultNamespace)
                {
-                       return Create (type, action, defaultNamespace, (DataContractFormatAttribute)null);
+                       return Create (messageContract, action, defaultNamespace, (DataContractFormatAttribute)null);
                }
 
                public static TypedMessageConverter Create (
-                       Type type, string action,
+                       Type messageContract, string action,
                        DataContractFormatAttribute formatterAttribute)
                {
-                       return Create (type, action, TempUri, formatterAttribute);
+                       return Create (messageContract, action, TempUri, formatterAttribute);
                }
 
                public static TypedMessageConverter Create (
-                       Type type,
+                       Type messageContract,
                        string action, string defaultNamespace,
                        DataContractFormatAttribute formatterAttribute)
                {
                        return new DefaultTypedMessageConverter (
                                new DataContractMessagesFormatter (
-                                       MessageContractToMessagesDescription (type, defaultNamespace, action),
+                                       MessageContractToMessagesDescription (messageContract, defaultNamespace, action),
                                        formatterAttribute));
                }
 
                public static TypedMessageConverter Create (
-                       Type type, string action,
+                       Type messageContract, string action,
                        XmlSerializerFormatAttribute formatterAttribute)
                {
-                       return Create (type, action, TempUri, formatterAttribute);
+                       return Create (messageContract, action, TempUri, formatterAttribute);
                }
 
                public static TypedMessageConverter Create (
-                       Type type, string action, string defaultNamespace,
+                       Type messageContract, string action, string defaultNamespace,
                        XmlSerializerFormatAttribute formatterAttribute)
                {
                        return new DefaultTypedMessageConverter (
                                new XmlMessagesFormatter (
-                                       MessageContractToMessagesDescription (type, defaultNamespace, action),
+                                       MessageContractToMessagesDescription (messageContract, defaultNamespace, action),
                                        formatterAttribute));
                }
 
@@ -136,8 +136,9 @@ namespace System.ServiceModel.Description
                                throw new ArgumentException (String.Format ("Type {0} and its ancestor types do not have MessageContract attribute.", src));
 
                        MessageDescriptionCollection messages = new MessageDescriptionCollection ();
-                       messages.Add (ContractDescriptionGenerator.CreateMessageDescription (src, defaultNamespace, action, true, mca));
-                       messages.Add (ContractDescriptionGenerator.CreateMessageDescription (src, defaultNamespace, action, false, mca));
+                       // FIXME: not sure if isDirectionInput arguments are ignorable (and can be dummy) here...
+                       messages.Add (ContractDescriptionGenerator.CreateMessageDescription (src, defaultNamespace, action, true, false, mca));
+                       messages.Add (ContractDescriptionGenerator.CreateMessageDescription (src, defaultNamespace, action, false, false, mca));
                        return messages;
                }
        }