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/lliohttpserver_tut.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/lliohttpserver_tut.cpp')
| -rw-r--r-- | indra/test/lliohttpserver_tut.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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) { |