You've already forked linux-packaging-mono
Imported Upstream version 6.4.0.137
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
parent
e9207cf623
commit
ef583813eb
@ -53,7 +53,7 @@ namespace System.Runtime.Remoting
|
||||
static string processGuid = null;
|
||||
static bool defaultConfigRead = false;
|
||||
static bool defaultDelayedConfigRead = false;
|
||||
static string _errorMode;
|
||||
static CustomErrorsModes _errorMode = CustomErrorsModes.RemoteOnly;
|
||||
|
||||
static Hashtable wellKnownClientEntries = new Hashtable();
|
||||
static Hashtable activatedClientEntries = new Hashtable();
|
||||
@ -81,11 +81,10 @@ namespace System.Runtime.Remoting
|
||||
set { applicationName = value; }
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static CustomErrorsModes CustomErrorsMode
|
||||
{
|
||||
get { throw new NotImplementedException (); }
|
||||
set { throw new NotImplementedException (); }
|
||||
get { return _errorMode; }
|
||||
set { _errorMode = value; }
|
||||
}
|
||||
|
||||
public static string ProcessId
|
||||
@ -387,8 +386,8 @@ namespace System.Runtime.Remoting
|
||||
|
||||
public static bool CustomErrorsEnabled (bool isLocalRequest)
|
||||
{
|
||||
if (_errorMode == "off") return false;
|
||||
if (_errorMode == "on") return true;
|
||||
if (_errorMode == CustomErrorsModes.Off) return false;
|
||||
if (_errorMode == CustomErrorsModes.On) return true;
|
||||
return !isLocalRequest;
|
||||
}
|
||||
|
||||
@ -403,7 +402,7 @@ namespace System.Runtime.Remoting
|
||||
if (m != "on" && m != "off" && m != "remoteonly")
|
||||
throw new RemotingException ("Invalid custom error mode: " + mode);
|
||||
|
||||
_errorMode = m;
|
||||
_errorMode = (CustomErrorsModes) Enum.Parse(typeof(CustomErrorsModes), m, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user