diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-11-18 12:33:07 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-11-18 12:33:07 -0500 |
| commit | 182566800a834df8cb12fb03a869b216ad13cd84 (patch) | |
| tree | afa934d25d9b683b3fa155ad2eba1ccfb612e544 /indra/test/io.cpp | |
| parent | 3819c3b049abb0771c7129c0a11a8fcd0725f9fd (diff) | |
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.
Diffstat (limited to 'indra/test/io.cpp')
| -rw-r--r-- | indra/test/io.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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) { |