From 85774de2310141f4311bc3df1946d44df9ddde59 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 6 Mar 2009 20:12:08 +0000
Subject: * Improve memory usage when writing OARs * This should make saving
 large OARs a somewhat better experience * However, the problem where saving
 an archive pulls large numbers of assets into the asset cache isn't yet
 resolved * This patch also removes lots of archive writing spam that crept in

---
 OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index e6146cf..d4c138a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -173,9 +173,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             //log4net.Config.XmlConfigurator.Configure();
             
             MemoryStream archiveWriteStream = new MemoryStream();
-            TarArchiveWriter tar = new TarArchiveWriter();
+            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
             
-            tar.AddFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
+            tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
             
             string part1Name = "object1";
             PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
@@ -194,9 +194,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 part1Name,
                 Math.Round(groupPosition.X), Math.Round(groupPosition.Y), Math.Round(groupPosition.Z),
                 part1.UUID);            
-            tar.AddFile(ArchiveConstants.OBJECTS_PATH + object1FileName, object1.ToXmlString2());
+            tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, object1.ToXmlString2());
             
-            tar.WriteTar(archiveWriteStream);
+            tar.Close();
             
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
             
-- 
cgit v1.1