diff options
| author | Marek Safar <marek.safar@gmail.com> | 2015-03-17 21:14:12 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2015-03-17 21:18:27 +0300 |
| commit | a4426f51b60f5ec1c0510c5e535e4ec8db80567a (patch) | |
| tree | d8a87b7437b0069956a925a741753b01ed6afaf4 /mcs/class/System.Runtime.Remoting | |
| parent | 8ac788afb3b9f0d529d11291f99b270ce626d891 (diff) | |
[System.Runtime.Remoting] Update internal TypeFilter levels
Diffstat (limited to 'mcs/class/System.Runtime.Remoting')
3 files changed, 8 insertions, 6 deletions
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs index 3e10dd9ef96..0b8c1ad8890 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs @@ -40,7 +40,7 @@ namespace System.Runtime.Remoting.Channels public class BinaryClientFormatterSink : IClientFormatterSink, IMessageSink, IClientChannelSink, IChannelSinkBase { - BinaryCore _binaryCore = BinaryCore.DefaultInstance; + BinaryCore _binaryCore = BinaryCore.DefaultClientInstance; IClientChannelSink _nextInChain; public BinaryClientFormatterSink (IClientChannelSink nextSink) diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs index cb232dc6e32..79f93e8a992 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs @@ -42,7 +42,7 @@ namespace System.Runtime.Remoting.Channels public BinaryClientFormatterSinkProvider () { - _binaryCore = BinaryCore.DefaultInstance; + _binaryCore = BinaryCore.DefaultClientInstance; } public BinaryClientFormatterSinkProvider (IDictionary properties, diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs index 400fabd8fac..430bf632f9e 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs @@ -43,10 +43,11 @@ namespace System.Runtime.Remoting.Channels bool _strictBinding = false; IDictionary _properties; - TypeFilterLevel _filterLevel = TypeFilterLevel.Low; - - public static BinaryCore DefaultInstance = new BinaryCore (); + TypeFilterLevel _filterLevel; + public static BinaryCore DefaultInstance = new BinaryCore (TypeFilterLevel.Low); + public static readonly BinaryCore DefaultClientInstance = new BinaryCore (TypeFilterLevel.Full); + public BinaryCore (object owner, IDictionary properties, string[] allowedProperties) { _properties = properties; @@ -87,8 +88,9 @@ namespace System.Runtime.Remoting.Channels Init (); } - public BinaryCore () + public BinaryCore (TypeFilterLevel filterLevel) { + _filterLevel = filterLevel; _properties = new Hashtable (); Init (); } |