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/io.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 38f86b9e57..ce747f667d 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -838,6 +838,7 @@ namespace tut
 		{
 			mChain.clear();
 			delete mPump;
+			apr_pool_destroy(mPool);
 		}
 	};
 	typedef test_group<PumpAndChainTestData>	PumpAndChainTestGroup;
@@ -908,9 +909,8 @@ namespace tut
 		
 		pipe_and_pump_fitness()
 		{
-			apr_pool_create(&mPool, NULL);
-
 			LLFrameTimer::updateFrameTime();
+			apr_pool_create(&mPool, NULL);
 			mPump = new LLPumpIO(mPool);
 			mSocket = LLSocket::create(
 				mPool,
@@ -922,6 +922,7 @@ namespace tut
 		{
 			mSocket.reset();
 			delete mPump;
+			apr_pool_destroy(mPool);
 		}
 
 	protected:
@@ -1248,13 +1249,14 @@ namespace tut
 			}
 		};
 
+		apr_pool_t* mPool;
 		LLPumpIO* mPump;
 		LLPumpIO::chain_t mChain;
 		LLSimpleRPCClient* mClient;
 		LLSD mResponse;
-		apr_pool_t* mPool;
 
 		rpc_server_data() :
+			mPool(NULL),
 			mPump(NULL),
 			mClient(NULL)
 		{
@@ -1274,6 +1276,8 @@ namespace tut
 			mChain.clear();
 			delete mPump;
 			mPump = NULL;
+			apr_pool_destroy(mPool);
+			mPool = NULL;
 		}
 		void pump_loop(const LLSD& request)
 		{
-- 
cgit v1.3