From ed0e2623b9dd9e12f7660bb067166c294ad8a2ee Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 29 Sep 2018 17:42:12 +0100 Subject: add a few more gc collect in some spots --- OpenSim/Server/Base/ServerUtils.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'OpenSim/Server') diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index d0043ba..b020215 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs @@ -204,8 +204,7 @@ namespace OpenSim.Server.Base xw.Flush(); ms.Seek(0, SeekOrigin.Begin); - byte[] ret = ms.GetBuffer(); - Array.Resize(ref ret, (int)ms.Length); + byte[] ret = ms.ToArray(); return ret; } @@ -579,9 +578,12 @@ namespace OpenSim.Server.Base // Try to read it try { - XmlReader r = XmlReader.Create(url); - IConfigSource cs = new XmlConfigSource(r); - source.Merge(cs); + IConfigSource cs; + using( XmlReader r = XmlReader.Create(url)) + { + cs = new XmlConfigSource(r); + source.Merge(cs); + } } catch (Exception e) { -- cgit v1.1