aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-11 22:54:22 +0100
committerJustin Clark-Casey (justincc)2012-07-11 22:54:22 +0100
commit916e3bf886ee622e2f18d6eb74f90fee8c630471 (patch)
tree69f9a6d2a7f7041966400f56f46c198f2cc06158 /OpenSim/Server
parentFix build break for windows with missing package for IScriptEngine in prebuil... (diff)
downloadopensim-SC_OLD-916e3bf886ee622e2f18d6eb74f90fee8c630471.zip
opensim-SC_OLD-916e3bf886ee622e2f18d6eb74f90fee8c630471.tar.gz
opensim-SC_OLD-916e3bf886ee622e2f18d6eb74f90fee8c630471.tar.bz2
opensim-SC_OLD-916e3bf886ee622e2f18d6eb74f90fee8c630471.tar.xz
Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.
The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 36c48e6..b137c05 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -27,9 +27,10 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Xml;
31using System.Threading;
32using System.Reflection; 30using System.Reflection;
31using System.Threading;
32using System.Text;
33using System.Xml;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
35using log4net; 36using log4net;
@@ -335,8 +336,7 @@ namespace OpenSim.Server.Base
335 { 336 {
336 string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); 337 string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
337 FileStream fs = File.Create(path); 338 FileStream fs = File.Create(path);
338 System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); 339 Byte[] buf = Encoding.ASCII.GetBytes(pidstring);
339 Byte[] buf = enc.GetBytes(pidstring);
340 fs.Write(buf, 0, buf.Length); 340 fs.Write(buf, 0, buf.Length);
341 fs.Close(); 341 fs.Close();
342 m_pidFile = path; 342 m_pidFile = path;