OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixing the console write on shutdown where the object is already disposed.

ThreadPoolClientBranch
Teravus Ovares 2008-02-05 02:10:01 +00:00
parent ffb6198380
commit ba142c0410
1 changed files with 64 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Console/LogBase.cs
View File

@ -231,6 +231,8 @@ namespace OpenSim.Framework.Console
} }
private void WriteNewLine(ConsoleColor color, string format, params object[] args) private void WriteNewLine(ConsoleColor color, string format, params object[] args)
{
try
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
@ -269,13 +271,23 @@ namespace OpenSim.Framework.Console
return; return;
} }
} }
catch (ObjectDisposedException)
{
return;
}
}
private void WritePrefixLine(ConsoleColor color, string sender) private void WritePrefixLine(ConsoleColor color, string sender)
{
try
{ {
lock (m_syncRoot) lock (m_syncRoot)
{ {
sender = sender.ToUpper(); sender = sender.ToUpper();
Log.WriteLine("[" + sender + "] "); Log.WriteLine("[" + sender + "] ");
Log.Flush(); Log.Flush();
System.Console.Write("["); System.Console.Write("[");
@ -297,6 +309,11 @@ namespace OpenSim.Framework.Console
return; return;
} }
} }
catch (ObjectDisposedException)
{
return;
}
}
public string ReadLine() public string ReadLine()