1 files changed, 10 insertions, 13 deletions

diff --git a/linden/indra/llmessage/llares.cpp b/linden/indra/llmessage/llares.cpp
index 578304a..fe37fe8 100644
--- a/linden/indra/llmessage/llares.cpp
+++ b/linden/indra/llmessage/llares.cpp
@@ -19,7 +19,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -469,9 +470,7 @@ bool LLAres::process(U64 timeout)
 
         int socks[ARES_GETSOCK_MAXNUM];
         apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
-        apr_int32_t nsds = 0;
-        apr_status_t status;
-        apr_pool_t *pool;
+        apr_int32_t nsds = 0;   
         int nactive = 0;
         int bitmask;
 
@@ -479,10 +478,12 @@ bool LLAres::process(U64 timeout)
 
         if (bitmask == 0)
         {
-                goto bail;
+                return nsds > 0;
         }
 
-        status = apr_pool_create(&pool, gAPRPoolp);
+        apr_status_t status;
+        LLAPRPool pool;
+        status = pool.getStatus() ;
         ll_apr_assert_status(status);
 
         for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
@@ -500,16 +501,16 @@ bool LLAres::process(U64 timeout)
 
                 apr_socket_t *aprSock = NULL;
 
-                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool);
+                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool.getAPRPool());
                 if (status != APR_SUCCESS)
                 {
                         ll_apr_warn_status(status);
-                        goto bail_pool;
+                        return nsds > 0;
                 }
 
                 aprFds[nactive].desc.s = aprSock;
                 aprFds[nactive].desc_type = APR_POLL_SOCKET;
-                aprFds[nactive].p = pool;
+                aprFds[nactive].p = pool.getAPRPool();
                 aprFds[nactive].rtnevents = 0;
                 aprFds[nactive].client_data = &socks[i];
 
@@ -537,10 +538,6 @@ bool LLAres::process(U64 timeout)
                 }
         }
 
-bail_pool:
-        apr_pool_destroy(pool);
-
-bail:
         return nsds > 0;
 }