Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[remoting] Fix multithreaded appdomain marshalling #9783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexischr wants to merge 1 commit into from
Closed

[remoting] Fix multithreaded appdomain marshalling #9783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions mcs/class/corlib/System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,12 @@ internal static IMessage DeserializeMessage(MemoryStream mem, IMethodCallMessage
serializer.SurrogateSelector = null;
mem.Position = 0;

if (msg == null)
return (IMessage) serializer.Deserialize(mem, null);
else
return (IMessage) serializer.DeserializeMethodResponse(mem, null, msg);
lock (serializer) {
if (msg == null)
return (IMessage) serializer.Deserialize(mem, null);
else
return (IMessage) serializer.DeserializeMethodResponse(mem, null, msg);
}
#else
throw new NotSupportedException ();
#endif
Expand All @@ -311,8 +313,9 @@ internal static MemoryStream SerializeMessage(IMessage msg)
BinaryFormatter serializer = new BinaryFormatter ();

serializer.SurrogateSelector = new RemotingSurrogateSelector ();
serializer.Serialize (mem, msg);

lock (serializer) {
serializer.Serialize (mem, msg);
}
mem.Position = 0;

return mem;
Expand Down Expand Up @@ -340,7 +343,9 @@ internal static MemoryStream SerializeObject(object obj)
BinaryFormatter serializer = new BinaryFormatter ();

serializer.SurrogateSelector = new RemotingSurrogateSelector ();
serializer.Serialize (mem, obj);
lock (serializer) {
serializer.Serialize (mem, obj);
}

mem.Position = 0;

Expand All @@ -354,7 +359,9 @@ internal static object DeserializeObject(MemoryStream mem)
serializer.SurrogateSelector = null;
mem.Position = 0;

return serializer.Deserialize (mem);
lock (serializer) {
return serializer.Deserialize (mem);
}
}
}

Expand Down