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

Imported Upstream version 5.14.0.78

Browse Source 
Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
View File

@ -780,7 +780,9 @@ namespace System.Runtime.Remoting
if (obj == null) return null;
MemoryStream ms = new MemoryStream ();
_serializationFormatter.Serialize (ms, obj);
lock (_serializationFormatter) {
_serializationFormatter.Serialize (ms, obj);
}
return ms.ToArray ();
}
@ -791,7 +793,10 @@ namespace System.Runtime.Remoting
if (array == null) return null;
MemoryStream ms = new MemoryStream (array);
object obj = _deserializationFormatter.Deserialize (ms);
object obj;
lock (_deserializationFormatter) {
obj = _deserializationFormatter.Deserialize (ms);
}
if (obj is CACD) {
CACD cad = (CACD) obj;
@ -813,7 +818,9 @@ namespace System.Runtime.Remoting
/* empty - we're only interested in the protected block */
} finally {
MemoryStream ms = new MemoryStream ();
_serializationFormatter.Serialize (ms, ex);
lock (_serializationFormatter) {
_serializationFormatter.Serialize (ms, ex);
}
result = ms.ToArray ();
}
return result;