mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryCore.cs
View File

@ -98,13 +98,8 @@ namespace System.Runtime.Remoting.Channels
RemotingSurrogateSelector surrogateSelector = new RemotingSurrogateSelector ();
StreamingContext context = new StreamingContext (StreamingContextStates.Remoting, null);
#if !TARGET_JVM
_serializationFormatter = new BinaryFormatter (surrogateSelector, context);
_deserializationFormatter = new BinaryFormatter (null, context);
#else
_serializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (surrogateSelector, context, false);
_deserializationFormatter = (BinaryFormatter) vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (null, context, false);
#endif
_serializationFormatter.FilterLevel = _filterLevel;
_deserializationFormatter.FilterLevel = _filterLevel;

12
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
View File

@ -46,9 +46,6 @@ namespace System.Runtime.Remoting.Channels
AutoResetEvent threadDone = new AutoResetEvent (false);
ArrayList runningThreads = new ArrayList ();
#if TARGET_JVM
volatile
#endif
bool stopped = false;
static object globalLock = new object ();
@ -75,11 +72,7 @@ namespace System.Runtime.Remoting.Channels
threadDone.Set ();
workItems.Clear ();
foreach (Thread t in runningThreads)
#if !TARGET_JVM
t.Abort ();
#else
t.Interrupt();
#endif
runningThreads.Clear ();
}
if (this == sharedPool)
@ -138,12 +131,7 @@ namespace System.Runtime.Remoting.Channels
void PoolThread ()
{
#if !TARGET_JVM
while (true) {
#else
while (!stopped)
{
#endif
ThreadStart work = null;
do {
lock (workItems) {

40
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapMessageFormatter.cs
View File

@ -74,34 +74,6 @@ namespace System.Runtime.Remoting.Channels {
if (sf != null) {
if(_serverFaultExceptionField != null)
e = (Exception) _serverFaultExceptionField.GetValue(sf);
#if TARGET_JVM
if (e == null && sf.ExceptionType != null)
{
try
{
Type te = Type.GetType(sf.ExceptionType);
if (te != null)
{
ConstructorInfo ce = te.GetConstructor(
BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.CreateInstance,
null, new Type[] {typeof(string)}, null);
if (ce != null)
{
e = (Exception) ce.Invoke(new object[] {sf.ExceptionMessage});
}
else
{
e = (Exception) Activator.CreateInstance(te);
}
}
}
catch
{
e = null;
}
}
#endif
}
if (e == null)
e = new RemotingException (fault.FaultString);
@ -431,12 +403,6 @@ namespace System.Runtime.Remoting.Channels {
object GetNullValue (Type paramType)
{
#if TARGET_JVM
if (paramType.IsEnum)
{
return Activator.CreateInstance(paramType);
}
#endif
switch (Type.GetTypeCode (paramType))
{
case TypeCode.Boolean: return false;
@ -453,12 +419,6 @@ namespace System.Runtime.Remoting.Channels {
case TypeCode.UInt32: return (uint)0;
case TypeCode.UInt64: return (ulong)0;
default:
#if TARGET_JVM
if (paramType.IsValueType)
{
return Activator.CreateInstance(paramType);
}
#endif
return null;
}
}