Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -70,10 +70,10 @@ namespace System.ServiceModel.Dispatcher {
return false;
}
public override bool Match (MessageBuffer buffer)
public override bool Match (MessageBuffer messageBuffer)
{
bool retval;
Message m = buffer.CreateMessage ();
Message m = messageBuffer.CreateMessage ();
retval = Match (m);
m.Close ();

View File

@ -65,6 +65,6 @@ namespace System.ServiceModel.Dispatcher {
set { transport_handler = value; }
}
public abstract bool HandleException (Exception e);
public abstract bool HandleException (Exception exception);
}
}

View File

@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
Collection<MessageFilter> filters;
public FilterInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {}
public FilterInvalidBodyAccessException (string msg) : base (msg) {}
public FilterInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}
public FilterInvalidBodyAccessException (string message) : base (message) {}
public FilterInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}
protected FilterInvalidBodyAccessException (SerializationInfo info, StreamingContext context)
: base (info, context) {}
public FilterInvalidBodyAccessException (string msg, Collection<MessageFilter> filters)
: base (msg)
public FilterInvalidBodyAccessException (string message, Collection<MessageFilter> filters)
: base (message)
{
this.filters = filters;
}
public FilterInvalidBodyAccessException (string msg, Exception inner, Collection<MessageFilter> filters)
: base (msg, inner)
public FilterInvalidBodyAccessException (string message, Exception innerException, Collection<MessageFilter> filters)
: base (message, innerException)
{
this.filters = filters;
}

View File

@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
public interface IDispatchMessageFormatter
{
void DeserializeRequest (Message message, object [] parameters);
Message SerializeReply (MessageVersion version, object [] parameters, object result);
Message SerializeReply (MessageVersion messageVersion, object [] parameters, object result);
}
}

View File

@ -32,8 +32,8 @@ namespace System.ServiceModel.Dispatcher
{
public interface IDispatchMessageInspector
{
object AfterReceiveRequest (ref Message message,
IClientChannel channel, InstanceContext context);
void BeforeSendReply (ref Message message, object instance);
object AfterReceiveRequest (ref Message request,
IClientChannel channel, InstanceContext instanceContext);
void BeforeSendReply (ref Message reply, object correlationState);
}
}

View File

@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
{
public interface IDispatchOperationSelector
{
string SelectOperation (ref Message msg);
string SelectOperation (ref Message message);
}
}

View File

@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher
{
public interface IErrorHandler
{
bool HandleError (Exception exception);
void ProvideFault (Exception exception, MessageVersion version,
bool HandleError (Exception error);
void ProvideFault (Exception error, MessageVersion version,
ref Message fault);
}
}

View File

@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
{
public interface IInstanceContextInitializer
{
void Initialize (InstanceContext context, Message message);
void Initialize (InstanceContext instanceContext, Message message);
}
}

View File

@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher
{
public interface IInstanceProvider
{
object GetInstance (InstanceContext context);
object GetInstance (InstanceContext context, Message message);
void ReleaseInstance (InstanceContext context, object instance);
object GetInstance (InstanceContext instanceContext);
object GetInstance (InstanceContext instanceContext, Message message);
void ReleaseInstance (InstanceContext instanceContext, object instance);
}
}

View File

@ -40,16 +40,16 @@ namespace System.ServiceModel.Dispatcher
IEnumerable<KeyValuePair<MessageFilter,TFilterData>>,
IEnumerable
{
bool GetMatchingFilter (Message message, out MessageFilter result);
bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result);
bool GetMatchingFilter (Message message, out MessageFilter filter);
bool GetMatchingFilter (MessageBuffer messageBuffer, out MessageFilter filter);
bool GetMatchingFilters (Message message, ICollection<MessageFilter> results);
bool GetMatchingFilters (MessageBuffer buffer, ICollection<MessageFilter> results);
bool GetMatchingFilters (MessageBuffer messageBuffer, ICollection<MessageFilter> results);
bool GetMatchingValue (Message message, out TFilterData data);
bool GetMatchingValue (MessageBuffer buffer, out TFilterData data);
bool GetMatchingValue (Message message, out TFilterData value);
bool GetMatchingValue (MessageBuffer messageBuffer, out TFilterData value);
bool GetMatchingValues (Message message, ICollection<TFilterData> results);
bool GetMatchingValues (MessageBuffer buffer, ICollection<TFilterData> results);
bool GetMatchingValues (MessageBuffer messageBuffer, ICollection<TFilterData> results);
}
}

View File

@ -1,4 +1,4 @@
//
//
// InstanceContextIdleCallback.cs
//
// Author: Atsushi Enomoto (atsushi@ximian.com)
@ -28,5 +28,5 @@ using System;
namespace System.ServiceModel.Dispatcher
{
public delegate void InstanceContextIdleCallback (InstanceContext context);
public delegate void InstanceContextIdleCallback (InstanceContext instanceContext);
}

View File

@ -34,8 +34,8 @@ namespace System.ServiceModel.Dispatcher
[Serializable]
public abstract class InvalidBodyAccessException : SystemException
{
protected InvalidBodyAccessException (string msg) : base (msg) {}
protected InvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}
protected InvalidBodyAccessException (string message) : base (message) {}
protected InvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}
protected InvalidBodyAccessException (SerializationInfo info, StreamingContext context)
: base (info, context) {}
}

View File

@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher
return true;
}
public override bool Match (MessageBuffer buffer)
public override bool Match (MessageBuffer messageBuffer)
{
// as documented
return true;

View File

@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher
return false;
}
public override bool Match (MessageBuffer buffer)
public override bool Match (MessageBuffer messageBuffer)
{
// as documented
return false;

View File

@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
Collection<MessageFilter> filters;
public MessageFilterException () : this ("MessageFilter node quota exceeded.") {}
public MessageFilterException (string msg) : base (msg) {}
public MessageFilterException (string msg, Exception inner) : base (msg, inner) {}
public MessageFilterException (string message) : base (message) {}
public MessageFilterException (string message, Exception innerException) : base (message, innerException) {}
protected MessageFilterException (SerializationInfo info, StreamingContext context)
: base (info, context) {}
public MessageFilterException (string msg, Collection<MessageFilter> filters)
: base (msg)
public MessageFilterException (string message, Collection<MessageFilter> filters)
: base (message)
{
this.filters = filters;
}
public MessageFilterException (string msg, Exception inner, Collection<MessageFilter> filters)
: base (msg, inner)
public MessageFilterException (string message, Exception innerException, Collection<MessageFilter> filters)
: base (message, innerException)
{
this.filters = filters;
}

View File

@ -46,9 +46,9 @@ namespace System.ServiceModel.Dispatcher
public MessageFilterTable ()
: this (0) {} // 0 is the default
public MessageFilterTable (int default_priority)
public MessageFilterTable (int defaultPriority)
{
this.default_priority = default_priority;
this.default_priority = defaultPriority;
table = new Dictionary<MessageFilter, TFilterData> ();
priority_list = new Dictionary<MessageFilter, int> ();
}
@ -85,9 +85,9 @@ namespace System.ServiceModel.Dispatcher
return table.ContainsKey (filter);
}
public void CopyTo (KeyValuePair<MessageFilter, TFilterData> [] array, int index)
public void CopyTo (KeyValuePair<MessageFilter, TFilterData> [] array, int arrayIndex)
{
((ICollection) table).CopyTo (array, index);
((ICollection) table).CopyTo (array, arrayIndex);
}
protected virtual IMessageFilterTable<TFilterData> CreateFilterTable (MessageFilter filter)
@ -105,11 +105,11 @@ namespace System.ServiceModel.Dispatcher
return priority_list [filter];
}
public bool GetMatchingFilter (Message message, out MessageFilter result)
public bool GetMatchingFilter (Message message, out MessageFilter filter)
{
if (message == null)
throw new ArgumentNullException ("message is null");
result = null;
filter = null;
int count = 0;
foreach (MessageFilter f in table.Keys) {
@ -121,14 +121,14 @@ namespace System.ServiceModel.Dispatcher
"More than one filter matches.");
count++;
result = f;
filter = f;
}
return count == 1;
}
public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result)
public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter filter)
{
return GetMatchingFilter (buffer.CreateMessage (), out result);
return GetMatchingFilter (buffer.CreateMessage (), out filter);
}
[MonoTODO ("Consider priority")]

View File

@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
Collection<MessageFilter> filters;
public MultipleFilterMatchesException () : base () {}
public MultipleFilterMatchesException (string msg) : base (msg) {}
public MultipleFilterMatchesException (string msg, Exception inner) : base (msg, inner) {}
public MultipleFilterMatchesException (string message) : base (message) {}
public MultipleFilterMatchesException (string message, Exception innerException) : base (message, innerException) {}
protected MultipleFilterMatchesException (SerializationInfo info, StreamingContext context)
: base (info, context) {}
public MultipleFilterMatchesException (string msg, Collection<MessageFilter> filters)
: base (msg)
public MultipleFilterMatchesException (string message, Collection<MessageFilter> filters)
: base (message)
{
this.filters = filters;
}
public MultipleFilterMatchesException (string msg, Exception inner, Collection<MessageFilter> filters)
: base (msg, inner)
public MultipleFilterMatchesException (string message, Exception innerException, Collection<MessageFilter> filters)
: base (message, innerException)
{
this.filters = filters;
}

View File

@ -35,8 +35,8 @@ namespace System.ServiceModel.Dispatcher
public class NavigatorInvalidBodyAccessException : InvalidBodyAccessException
{
public NavigatorInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {}
public NavigatorInvalidBodyAccessException (string msg) : base (msg) {}
public NavigatorInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}
public NavigatorInvalidBodyAccessException (string message) : base (message) {}
public NavigatorInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}
protected NavigatorInvalidBodyAccessException (SerializationInfo info, StreamingContext context)
: base (info, context) {}
}

View File

@ -36,12 +36,12 @@ namespace System.ServiceModel.Dispatcher
{
protected SeekableXPathNavigator () {}
public abstract XmlNodeOrder ComparePosition (long first, long second);
public abstract string GetLocalName (long node_position);
public abstract string GetName (long node_position);
public abstract string GetNamespace (long node_position);
public abstract XPathNodeType GetNodeType (long node_position);
public abstract string GetValue (long node_position);
public abstract XmlNodeOrder ComparePosition (long firstPosition, long secondPosition);
public abstract string GetLocalName (long nodePosition);
public abstract string GetName (long nodePosition);
public abstract string GetNamespace (long nodePosition);
public abstract XPathNodeType GetNodeType (long nodePosition);
public abstract string GetValue (long nodePosition);
public abstract long CurrentPosition { get; set; }
}

View File

@ -41,8 +41,8 @@ namespace System.ServiceModel.Dispatcher
{
}
public XPathMessageContext (NameTable nameTable)
: base (nameTable)
public XPathMessageContext (NameTable table)
: base (table)
{
AddNamespace ("s11", Constants.Soap11);
AddNamespace ("s12", Constants.Soap12);
@ -52,9 +52,9 @@ namespace System.ServiceModel.Dispatcher
get { return false; } // as documented.
}
public override int CompareDocument (string uri1, string uri2)
public override int CompareDocument (string baseUri, string nextBaseUri)
{
return String.CompareOrdinal (uri1, uri2);
return String.CompareOrdinal (baseUri, nextBaseUri);
}
public override bool PreserveWhitespace (XPathNavigator node)

Some files were not shown because too many files have changed in this diff Show More