From 182566800a834df8cb12fb03a869b216ad13cd84 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 18 Nov 2011 12:33:07 -0500
Subject: Re-added some missing calls to apr_pool_destroy() that I failed to
 readd after the thread local storage rollback. Also added a call to
 LLProxy::cleanupClass() to prevent indra/test from segfaulting on exit.

---
 indra/test/lliohttpserver_tut.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/test/lliohttpserver_tut.cpp')

diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp
index d12733dbee..2fdc455f45 100644
--- a/indra/test/lliohttpserver_tut.cpp
+++ b/indra/test/lliohttpserver_tut.cpp
@@ -76,14 +76,12 @@ namespace tut
 		HTTPServiceTestData()
 			: mResponse(NULL)
 		{
-			apr_pool_create(&mPool, NULL);
 			LLHTTPStandardServices::useServices();
 			LLHTTPRegistrar::buildAllServices(mRoot);
 			mRoot.addNode("/delayed/echo", new DelayedEcho(this));
 			mRoot.addNode("/wire/hello", new LLHTTPNodeForPipe<WireHello>);
 		}
 		
-		apr_pool_t* mPool;
 		LLHTTPNode mRoot;
 		LLHTTPNode::ResponsePtr mResponse;
 		LLSD mResult;
@@ -106,8 +104,11 @@ namespace tut
 			LLPipeStringInjector* injector = new LLPipeStringInjector(httpRequest);
 			LLPipeStringExtractor* extractor = new LLPipeStringExtractor();
 			
+			apr_pool_t* pool;
+			apr_pool_create(&pool, NULL);
+
 			LLPumpIO* pump;
-			pump = new LLPumpIO(mPool);
+			pump = new LLPumpIO(pool);
 
 			LLPumpIO::chain_t chain;
 			LLSD context;
@@ -130,6 +131,7 @@ namespace tut
 
 			chain.clear();
 			delete pump;
+			apr_pool_destroy(pool);
 
 			if(mResponse.notNull() && timeout)
 			{
-- 
cgit v1.2.3